]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Fix OpenSSH pty regression on close
authorBrian Bloniarz <brian.bloniarz@gmail.com>
Sun, 6 Mar 2016 21:16:30 +0000 (13:16 -0800)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:21:53 +0000 (17:21 -0500)
commit18dca5995e3341e7deb6a5116eda03fba0e9ee12
tree275e6ee8f1a8fdda01401a12b825c1ca9ab4c9e7
parent108042097bb7879629289a014b64bf258102c564
Fix OpenSSH pty regression on close

Orabug: 25256923

[ Upstream commit 0f40fbbcc34e093255a2b2d70b6b0fb48c3f39aa ]

OpenSSH expects the (non-blocking) read() of pty master to return
EAGAIN only if it has received all of the slave-side output after
it has received SIGCHLD. This used to work on pre-3.12 kernels.

This fix effectively forces non-blocking read() and poll() to
block for parallel i/o to complete for all ttys. It also unwinds
these changes:

1) f8747d4a466ab2cafe56112c51b3379f9fdb7a12
   tty: Fix pty master read() after slave closes

2) 52bce7f8d4fc633c9a9d0646eef58ba6ae9a3b73
   pty, n_tty: Simplify input processing on final close

3) 1a48632ffed61352a7810ce089dc5a8bcd505a60
   pty: Fix input race when closing

Inspired by analysis and patch from Marc Aurele La France <tsi@tuyoix.net>

Reported-by: Volth <openssh@volth.com>
Reported-by: Marc Aurele La France <tsi@tuyoix.net>
BugLink: https://bugzilla.mindrot.org/show_bug.cgi?id=52
BugLink: https://bugzilla.mindrot.org/show_bug.cgi?id=2492
Signed-off-by: Brian Bloniarz <brian.bloniarz@gmail.com>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 29a7543e33dbb168c1e044a3ad411ce96286924b)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
Documentation/serial/tty.txt
drivers/tty/n_hdlc.c
drivers/tty/n_tty.c
drivers/tty/pty.c
drivers/tty/tty_buffer.c
include/linux/tty.h