فهرست منبع

[PATCH] tty: fix the locking for signal->session in disassociate_ctty

commit 24ec839c431eb79bb8f6abc00c4e1eb3b8c4d517 while fixing the locking for
signal->tty got the locking wrong for signal->session.  This places our
accesses of signal->session back under the tasklist_lock where they belong.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Eric W. Biederman 18 سال پیش
والد
کامیت
2ea81868d8
1فایلهای تغییر یافته به همراه1 افزوده شده و 3 حذف شده
  1. 1 3
      drivers/char/tty_io.c

+ 1 - 3
drivers/char/tty_io.c

@@ -1496,7 +1496,6 @@ void disassociate_ctty(int on_exit)
 {
 {
 	struct tty_struct *tty;
 	struct tty_struct *tty;
 	int tty_pgrp = -1;
 	int tty_pgrp = -1;
-	int session;
 
 
 	lock_kernel();
 	lock_kernel();
 
 
@@ -1530,7 +1529,6 @@ void disassociate_ctty(int on_exit)
 
 
 	spin_lock_irq(&current->sighand->siglock);
 	spin_lock_irq(&current->sighand->siglock);
 	current->signal->tty_old_pgrp = 0;
 	current->signal->tty_old_pgrp = 0;
-	session = process_session(current);
 	spin_unlock_irq(&current->sighand->siglock);
 	spin_unlock_irq(&current->sighand->siglock);
 
 
 	mutex_lock(&tty_mutex);
 	mutex_lock(&tty_mutex);
@@ -1549,7 +1547,7 @@ void disassociate_ctty(int on_exit)
 
 
 	/* Now clear signal->tty under the lock */
 	/* Now clear signal->tty under the lock */
 	read_lock(&tasklist_lock);
 	read_lock(&tasklist_lock);
-	session_clear_tty(session);
+	session_clear_tty(process_session(current));
 	read_unlock(&tasklist_lock);
 	read_unlock(&tasklist_lock);
 	unlock_kernel();
 	unlock_kernel();
 }
 }