Re: [PATCH v3 3/6] TTY: fix DTR being raised on hang up
From: Peter Hurley <hidden>
Date: 2013-03-13 19:43:57
Also in:
lkml
On Thu, 2013-03-07 at 15:55 +0100, Johan Hovold wrote:
quoted hunk ↗ jump to hunk
Make sure to check ASYNC_INITIALISED before raising DTR when waking up from blocked open in tty_port_block_til_ready. Currently DTR could get raised at hang up as a blocked process would raise DTR unconditionally before checking for hang up and returning. Signed-off-by: Johan Hovold <redacted> --- drivers/tty/tty_port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index 3de5918..52f1066 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c@@ -355,7 +355,7 @@ int tty_port_block_til_ready(struct tty_port *port, while (1) { /* Indicate we are open */ - if (tty->termios.c_cflag & CBAUD) + if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags)) tty_port_raise_dtr_rts(port); prepare_to_wait(&port->open_wait, &wait, TASK_INTERRUPTIBLE);
This is ok, but there are 6 other *_block_til_ready() functions: This one doesn't use DTR/RTS so can be ignored: ./drivers/staging/sb105x/sb_pci_mp.c:static int mp_block_til_ready(struct file *filp, struct sb_uart_state *state) This one is so scary you should probably leave it alone: ./drivers/tty/serial/crisv10.c:block_til_ready(struct tty_struct *tty, struct file * filp, These will need the same change (although be careful: some use ASYNC_INITIALIZED rather than ASYNCB_INITIALIZED). ./drivers/tty/synclinkmp.c:static int block_til_ready(struct tty_struct *tty, struct file *filp, ./drivers/tty/synclink_gt.c:static int block_til_ready(struct tty_struct *tty, struct file *filp, ./drivers/tty/synclink.c:static int block_til_ready(struct tty_struct *tty, struct file * filp, ./net/irda/ircomm/ircomm_tty.c:static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, Please be sure to Cc: David Miller [off-list ref] on changes to net/irda. Regards, Peter Hurley