summaryrefslogtreecommitdiffstats
path: root/drivers/tty/pty.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-10-16 21:33:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-06 01:34:36 +0100
commit4ed60fc257185dbb0daea7cd3e4289d1658b11f6 (patch)
tree45f256d65961d5b86d33946eda270d401521aab2 /drivers/tty/pty.c
parentpty: Fix packet mode setting race (diff)
downloadlinux-4ed60fc257185dbb0daea7cd3e4289d1658b11f6.tar.xz
linux-4ed60fc257185dbb0daea7cd3e4289d1658b11f6.zip
pty: Hold ctrl_lock for packet mode updates
Updates to the packet mode enable require holding the ctrl_lock; the serialization prevents corruption of adjacent fields. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Reviewed-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/pty.c')
-rw-r--r--drivers/tty/pty.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index bcec4c71a408..7a1a53819e22 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -47,7 +47,9 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
set_bit(TTY_IO_ERROR, &tty->flags);
wake_up_interruptible(&tty->read_wait);
wake_up_interruptible(&tty->write_wait);
+ spin_lock_irq(&tty->ctrl_lock);
tty->packet = 0;
+ spin_unlock_irq(&tty->ctrl_lock);
/* Review - krefs on tty_link ?? */
if (!tty->link)
return;