Commit ae28fa72 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

tty: Remove !tty condition from __proc_set_tty()

The tty parameter to __proc_set_tty() cannot be NULL; all
call sites have already dereferenced tty.
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b239542
...@@ -506,19 +506,18 @@ void proc_clear_tty(struct task_struct *p) ...@@ -506,19 +506,18 @@ void proc_clear_tty(struct task_struct *p)
static void __proc_set_tty(struct tty_struct *tty) static void __proc_set_tty(struct tty_struct *tty)
{ {
if (tty) { unsigned long flags;
unsigned long flags;
/* We should not have a session or pgrp to put here but.... */ /* We should not have a session or pgrp to put here but.... */
spin_lock_irqsave(&tty->ctrl_lock, flags); spin_lock_irqsave(&tty->ctrl_lock, flags);
put_pid(tty->session); put_pid(tty->session);
put_pid(tty->pgrp); put_pid(tty->pgrp);
tty->pgrp = get_pid(task_pgrp(current)); tty->pgrp = get_pid(task_pgrp(current));
spin_unlock_irqrestore(&tty->ctrl_lock, flags); spin_unlock_irqrestore(&tty->ctrl_lock, flags);
tty->session = get_pid(task_session(current)); tty->session = get_pid(task_session(current));
if (current->signal->tty) { if (current->signal->tty) {
printk(KERN_DEBUG "tty not NULL!!\n"); printk(KERN_DEBUG "tty not NULL!!\n");
tty_kref_put(current->signal->tty); tty_kref_put(current->signal->tty);
}
} }
put_pid(current->signal->tty_old_pgrp); put_pid(current->signal->tty_old_pgrp);
current->signal->tty = tty_kref_get(tty); current->signal->tty = tty_kref_get(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