diff options
| author | Patrick Donnelly <batrick@batbytes.com> | 2015-07-12 18:51:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-23 17:56:38 -0700 |
| commit | 6719693ca2efb0f04654d05768ee299e87e1694b (patch) | |
| tree | 08cc78496b9c1251dc21d2f52a8f995b955f8b81 /drivers/tty/tty_io.c | |
| parent | da891641b6c92e260966dfce3dd93111d08656c8 (diff) | |
| download | linux-6719693ca2efb0f04654d05768ee299e87e1694b.tar.bz2 | |
tty: add missing rcu_read_lock for task_pgrp
task_pgrp requires an rcu or tasklist lock to be obtained if the returned pid
is to be dereferenced, which kill_pgrp does. Obtain an RCU lock for the
duration of use.
Signed-off-by: Patrick Donnelly <batrick@batbytes.com>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 57fc6ee12332..6bdfb98bf020 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -388,33 +388,40 @@ EXPORT_SYMBOL_GPL(tty_find_polling_driver); int tty_check_change(struct tty_struct *tty) { unsigned long flags; + struct pid *pgrp; int ret = 0; if (current->signal->tty != tty) return 0; + rcu_read_lock(); + pgrp = task_pgrp(current); + spin_lock_irqsave(&tty->ctrl_lock, flags); if (!tty->pgrp) { printk(KERN_WARNING "tty_check_change: tty->pgrp == NULL!\n"); goto out_unlock; } - if (task_pgrp(current) == tty->pgrp) + if (pgrp == tty->pgrp) goto out_unlock; spin_unlock_irqrestore(&tty->ctrl_lock, flags); + if (is_ignored(SIGTTOU)) - goto out; + goto out_rcuunlock; if (is_current_pgrp_orphaned()) { ret = -EIO; - goto out; + goto out_rcuunlock; } - kill_pgrp(task_pgrp(current), SIGTTOU, 1); + kill_pgrp(pgrp, SIGTTOU, 1); + rcu_read_unlock(); set_thread_flag(TIF_SIGPENDING); ret = -ERESTARTSYS; -out: return ret; out_unlock: spin_unlock_irqrestore(&tty->ctrl_lock, flags); +out_rcuunlock: + rcu_read_unlock(); return ret; } |