From: Peter Hurley <peter@hurleysoftware.com>
Date: Wed, 5 Nov 2014 17:13:04 +0000 (-0500)
Subject: pty: Don't drop pty master tty lock to hangup slave
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1bb954153aa97702db4363c6746794d097d9c707;p=deliverable%2Flinux.git

pty: Don't drop pty master tty lock to hangup slave

With the revised tty lock order and lockdep annotation, claiming
the pty slave lock is now safe while still holding the pty master lock.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 11db7dc8676b..bee9776730fd 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -66,9 +66,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
 			mutex_unlock(&devpts_mutex);
 		}
 #endif
-		tty_unlock(tty);
 		tty_vhangup(tty->link);
-		tty_lock(tty);
 	}
 }