summaryrefslogtreecommitdiff
path: root/drivers/tty/pty.c
diff options
context:
space:
mode:
authorMatthijs van Duin <matthijsvanduin@gmail.com>2018-07-19 11:43:46 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-24 14:08:55 +0300
commit4aec7c283904207d6dc2bd3a319d4e77ce60c77c (patch)
treea06e18b6485dede97df8dd8be25a57301c3b9817 /drivers/tty/pty.c
parent96de65df193607b81ba7323861d58ff7efd3bf38 (diff)
downloadlinux-4aec7c283904207d6dc2bd3a319d4e77ce60c77c.tar.xz
pty: fix O_CLOEXEC for TIOCGPTPEER
commit 36ecc1481dc8d8c52d43ba18c6b642c1d2fde789 upstream. It was being ignored because the flags were not passed to fd allocation. Fixes: 54ebbfb16034 ("tty: add TIOCGPTPEER ioctl") Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com> Acked-by: Aleksa Sarai <asarai@suse.de> Cc: stable <stable@vger.kernel.org> 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, 1 insertions, 1 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 899e8fe5e00f..9e26c530d2dd 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -625,7 +625,7 @@ int ptm_open_peer(struct file *master, struct tty_struct *tty, int flags)
if (tty->driver != ptm_driver)
return -EIO;
- fd = get_unused_fd_flags(0);
+ fd = get_unused_fd_flags(flags);
if (fd < 0) {
retval = fd;
goto err;