summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-09-25 20:13:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-05 07:13:10 -0700
commitfe0da74501e9eb204dc1b8167708bd9273f4277f (patch)
tree6801282699403cea3f58bd1293bf3f441a3d16ef /drivers/tty
parent51d4e0771c3c69bb021d3052433e49effa6e4f65 (diff)
downloadlinux-3.10-fe0da74501e9eb204dc1b8167708bd9273f4277f.tar.gz
linux-3.10-fe0da74501e9eb204dc1b8167708bd9273f4277f.tar.bz2
linux-3.10-fe0da74501e9eb204dc1b8167708bd9273f4277f.zip
tty: Fix SIGTTOU not sent with tcflush()
commit 5cec7bf699c61d14f0538345076480bb8c8ebfbb upstream. Commit 'e7f3880cd9b98c5bf9391ae7acdec82b75403776' tty: Fix recursive deadlock in tty_perform_flush() introduced a regression where tcflush() does not generate SIGTTOU for background process groups. Make sure ioctl(TCFLSH) calls tty_check_change() when invoked from the line discipline. Reported-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/tty_ioctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 3500d411414..088b4ca7d80 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -1201,6 +1201,9 @@ int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
}
return 0;
case TCFLSH:
+ retval = tty_check_change(tty);
+ if (retval)
+ return retval;
return __tty_perform_flush(tty, arg);
default:
/* Try the mode commands */