Skip to content

Commit b8caf69

Browse files
krzkgregkh
authored andcommitted
tty: serial: qcom-geni-serial: fix slab-out-of-bounds on RX FIFO buffer
Driver's probe allocates memory for RX FIFO (port->rx_fifo) based on default RX FIFO depth, e.g. 16. Later during serial startup the qcom_geni_serial_port_setup() updates the RX FIFO depth (port->rx_fifo_depth) to match real device capabilities, e.g. to 32. The RX UART handle code will read "port->rx_fifo_depth" number of words into "port->rx_fifo" buffer, thus exceeding the bounds. This can be observed in certain configurations with Qualcomm Bluetooth HCI UART device and KASAN: Bluetooth: hci0: QCA Product ID :0x00000010 Bluetooth: hci0: QCA SOC Version :0x400a0200 Bluetooth: hci0: QCA ROM Version :0x00000200 Bluetooth: hci0: QCA Patch Version:0x00000d2b Bluetooth: hci0: QCA controller version 0x02000200 Bluetooth: hci0: QCA Downloading qca/htbtfw20.tlv bluetooth hci0: Direct firmware load for qca/htbtfw20.tlv failed with error -2 Bluetooth: hci0: QCA Failed to request file: qca/htbtfw20.tlv (-2) Bluetooth: hci0: QCA Failed to download patch (-2) ================================================================== BUG: KASAN: slab-out-of-bounds in handle_rx_uart+0xa8/0x18c Write of size 4 at addr ffff279347d578c0 by task swapper/0/0 CPU: 0 PID: 0 Comm: swapper/0 Not tainted 6.1.0-rt5-00350-gb2450b7e00be-dirty #26 Hardware name: Qualcomm Technologies, Inc. Robotics RB5 (DT) Call trace: dump_backtrace.part.0+0xe0/0xf0 show_stack+0x18/0x40 dump_stack_lvl+0x8c/0xb8 print_report+0x188/0x488 kasan_report+0xb4/0x100 __asan_store4+0x80/0xa4 handle_rx_uart+0xa8/0x18c qcom_geni_serial_handle_rx+0x84/0x9c qcom_geni_serial_isr+0x24c/0x760 __handle_irq_event_percpu+0x108/0x500 handle_irq_event+0x6c/0x110 handle_fasteoi_irq+0x138/0x2cc generic_handle_domain_irq+0x48/0x64 If the RX FIFO depth changes after probe, be sure to resize the buffer. Fixes: f9d690b ("tty: serial: qcom_geni_serial: Allocate port->rx_fifo buffer in probe") Cc: <[email protected]> Signed-off-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Jiri Slaby <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5dc4c99 commit b8caf69

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

drivers/tty/serial/qcom_geni_serial.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,16 +864,27 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *dev)
864864
return IRQ_HANDLED;
865865
}
866866

867-
static void get_tx_fifo_size(struct qcom_geni_serial_port *port)
867+
static int setup_fifos(struct qcom_geni_serial_port *port)
868868
{
869869
struct uart_port *uport;
870+
u32 old_rx_fifo_depth = port->rx_fifo_depth;
870871

871872
uport = &port->uport;
872873
port->tx_fifo_depth = geni_se_get_tx_fifo_depth(&port->se);
873874
port->tx_fifo_width = geni_se_get_tx_fifo_width(&port->se);
874875
port->rx_fifo_depth = geni_se_get_rx_fifo_depth(&port->se);
875876
uport->fifosize =
876877
(port->tx_fifo_depth * port->tx_fifo_width) / BITS_PER_BYTE;
878+
879+
if (port->rx_fifo && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) {
880+
port->rx_fifo = devm_krealloc(uport->dev, port->rx_fifo,
881+
port->rx_fifo_depth * sizeof(u32),
882+
GFP_KERNEL);
883+
if (!port->rx_fifo)
884+
return -ENOMEM;
885+
}
886+
887+
return 0;
877888
}
878889

879890

@@ -888,6 +899,7 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport)
888899
u32 rxstale = DEFAULT_BITS_PER_CHAR * STALE_TIMEOUT;
889900
u32 proto;
890901
u32 pin_swap;
902+
int ret;
891903

892904
proto = geni_se_read_proto(&port->se);
893905
if (proto != GENI_SE_UART) {
@@ -897,7 +909,9 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport)
897909

898910
qcom_geni_serial_stop_rx(uport);
899911

900-
get_tx_fifo_size(port);
912+
ret = setup_fifos(port);
913+
if (ret)
914+
return ret;
901915

902916
writel(rxstale, uport->membase + SE_UART_RX_STALE_CNT);
903917

0 commit comments

Comments
 (0)