From: Peter Hurley Date: Thu, 16 Oct 2014 18:59:50 +0000 (-0400) Subject: tty: Update code comment in __proc_set_tty() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a361858da327263e04dc521ca39091d3119ccff8;p=linux-beck.git tty: Update code comment in __proc_set_tty() The session and foreground process group pid references will be non-NULL if tiocsctty() is stealing the controlling tty from another session (ie., arg == 1 in tiocsctty()). Signed-off-by: Peter Hurley Reviewed-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 07275d0e30a2..9d1e247ee330 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -516,8 +516,11 @@ static void __proc_set_tty(struct tty_struct *tty) { unsigned long flags; - /* We should not have a session or pgrp to put here but.... */ spin_lock_irqsave(&tty->ctrl_lock, flags); + /* + * The session and fg pgrp references will be non-NULL if + * tiocsctty() is stealing the controlling tty + */ put_pid(tty->session); put_pid(tty->pgrp); tty->pgrp = get_pid(task_pgrp(current));