[PATCH] tty: ->signal->tty locking
Fix the locking of signal->tty.
Use ->sighand->siglock to protect ->signal->tty; this lock is already used
by most other members of ->signal/->sighand. And unless we are 'current'
or the tasklist_lock is held we need ->siglock to access ->signal anyway.
(NOTE: sys_unshare() is broken wrt ->sighand locking rules)
Note that tty_mutex is held over tty destruction, so while holding
tty_mutex any tty pointer remains valid. Otherwise the lifetime of ttys
are governed by their open file handles. This leaves some holes for tty
access from signal->tty (or any other non file related tty access).
It solves the tty SLAB scribbles we were seeing.
(NOTE: the change from group_send_sig_info to __group_send_sig_info needs to
be examined by someone familiar with the security framework, I think
it is safe given the SEND_SIG_PRIV from other __group_send_sig_info
invocations)
[schwidefsky@de.ibm.com: 3270 fix]
[akpm@osdl.org: various post-viro fixes]
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Alan Cox <alan@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
562f9c574e
commit
24ec839c43
+4
-2
@@ -1484,7 +1484,6 @@ asmlinkage long sys_setsid(void)
|
||||
pid_t session;
|
||||
int err = -EPERM;
|
||||
|
||||
mutex_lock(&tty_mutex);
|
||||
write_lock_irq(&tasklist_lock);
|
||||
|
||||
/* Fail if I am already a session leader */
|
||||
@@ -1504,12 +1503,15 @@ asmlinkage long sys_setsid(void)
|
||||
|
||||
group_leader->signal->leader = 1;
|
||||
__set_special_pids(session, session);
|
||||
|
||||
spin_lock(&group_leader->sighand->siglock);
|
||||
group_leader->signal->tty = NULL;
|
||||
group_leader->signal->tty_old_pgrp = 0;
|
||||
spin_unlock(&group_leader->sighand->siglock);
|
||||
|
||||
err = process_group(group_leader);
|
||||
out:
|
||||
write_unlock_irq(&tasklist_lock);
|
||||
mutex_unlock(&tty_mutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user