Skip to contentSkip to conversation

tty:pty: move wake_up*() after tty_vhangup() in pty_close()

PATCH In review Yan Cangang 2 participants 2 messages Jan 27, 2023 – Jan 31, 2023 TTY layer and serial drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tty:pty: move wake_up*() after tty_vhangup() in pty_close()

wake_up_interruptible() may wake up the session leader blocked on pts, at this time the tty_signal_session_leader() in __tty_hangup() has not been executed.

The session leader's subsequent IO on pts will fail, but the session leader did not received SIGHUP as expected at this time.

A observed phenomenon is that when the ssh connection is disconnected, the background jobs managed by bash did not terminate as expected. This problem is more easily observed on low-end single-processor systems.

---
 drivers/tty/pty.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/pty.c +2 -2
index 07394fdaf522..fbcf2caa8fc1 100644
@@ -64,8 +64,6 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
 	if (!tty->link)
 		return;
 	set_bit(TTY_OTHER_CLOSED, &tty->link->flags);
-	wake_up_interruptible(&tty->link->read_wait);
-	wake_up_interruptible(&tty->link->write_wait);
 	if (tty->driver->subtype == PTY_TYPE_MASTER) {
 		set_bit(TTY_OTHER_CLOSED, &tty->flags);
 #ifdef CONFIG_UNIX98_PTYS
@@ -78,6 +76,8 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
 #endif
 		tty_vhangup(tty->link);
 	}
+	wake_up_interruptible(&tty->link->read_wait);
+	wake_up_interruptible(&tty->link->write_wait);
 }
 
 /*
Signature · 1 line
2.30.2
maintainer
#1 lore raw
Quoted 10 lines · Yan Cangang

wake_up_interruptible() may wake up the session leader blocked on pts, at this time the tty_signal_session_leader() in __tty_hangup() has not been executed.

The session leader's subsequent IO on pts will fail, but the session leader did not received SIGHUP as expected at this time.

A observed phenomenon is that when the ssh connection is disconnected, the background jobs managed by bash did not terminate as expected. This problem is more easily observed on low-end single-processor systems.

This feels odd, why is this only showing up now? What changed to cause this issue?

What commit id does this fix?

thanks,

greg k-h