Skip to content

Commit 455ce98

Browse files
mrpregregkh
authored andcommitted
serial: core: fix infinite loop in handle_tx() for PORT_UNKNOWN
uart_write_room() and uart_write() behave inconsistently when xmit_buf is NULL (which happens for PORT_UNKNOWN ports that were never properly initialized): - uart_write_room() returns kfifo_avail() which can be > 0 - uart_write() checks xmit_buf and returns 0 if NULL This inconsistency causes an infinite loop in drivers that rely on tty_write_room() to determine if they can write: while (tty_write_room(tty) > 0) { written = tty->ops->write(...); // written is always 0, loop never exits } For example, caif_serial's handle_tx() enters an infinite loop when used with PORT_UNKNOWN serial ports, causing system hangs. Fix by making uart_write_room() also check xmit_buf and return 0 if it's NULL, consistent with uart_write(). Reproducer: https://gist.github.com/mrpre/d9a694cc0e19828ee3bc3b37983fde13 Signed-off-by: Jiayuan Chen <[email protected]> Cc: stable <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d54801c commit 455ce98

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/tty/serial/serial_core.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,10 @@ static unsigned int uart_write_room(struct tty_struct *tty)
643643
unsigned int ret;
644644

645645
port = uart_port_ref_lock(state, &flags);
646-
ret = kfifo_avail(&state->port.xmit_fifo);
646+
if (!state->port.xmit_buf)
647+
ret = 0;
648+
else
649+
ret = kfifo_avail(&state->port.xmit_fifo);
647650
uart_port_unlock_deref(port, flags);
648651
return ret;
649652
}

0 commit comments

Comments
 (0)