Commit 7c3b1dcf authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds

tty: make sure that proc_clear_tty stores the cpu flags

proc_clear_tty() gets called with interrupts off (while holding the task list
lock) from sys_setid. This means that it needs the _irqsave version of the
locking primitives.
Reported-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Tested-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d54aaf3
...@@ -3032,11 +3032,12 @@ EXPORT_SYMBOL(tty_devnum); ...@@ -3032,11 +3032,12 @@ EXPORT_SYMBOL(tty_devnum);
void proc_clear_tty(struct task_struct *p) void proc_clear_tty(struct task_struct *p)
{ {
unsigned long flags;
struct tty_struct *tty; struct tty_struct *tty;
spin_lock_irq(&p->sighand->siglock); spin_lock_irqsave(&p->sighand->siglock, flags);
tty = p->signal->tty; tty = p->signal->tty;
p->signal->tty = NULL; p->signal->tty = NULL;
spin_unlock_irq(&p->sighand->siglock); spin_unlock_irqrestore(&p->sighand->siglock, flags);
tty_kref_put(tty); tty_kref_put(tty);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment