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

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

drivers/tty/tty_io.c

+12 −13
Original line number Diff line number Diff line
@@ -506,8 +506,8 @@ void proc_clear_tty(struct task_struct *p) 


static void __proc_set_tty(struct tty_struct *tty)

{

	if (tty) {

	unsigned long flags;



	/* We should not have a session or pgrp to put here but.... */

	spin_lock_irqsave(&tty->ctrl_lock, flags);

	put_pid(tty->session);
@@ -519,7 +519,6 @@ static void __proc_set_tty(struct tty_struct *tty) 
		printk(KERN_DEBUG "tty not NULL!!\n");

		tty_kref_put(current->signal->tty);

	}

	}

	put_pid(current->signal->tty_old_pgrp);

	current->signal->tty = tty_kref_get(tty);

	current->signal->tty_old_pgrp = NULL;