Commit 6e622cd8 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman

tty: fix compat TIOCGSERIAL checking wrong function ptr

Commit 77654350 ("take compat TIOC[SG]SERIAL treatment into
tty_compat_ioctl()") changed the compat version of TIOCGSERIAL to start
checking for the presence of the ->set_serial function pointer rather
than ->get_serial.  This appears to be a copy-and-paste error, since
->get_serial is the function pointer that is called as well as the
pointer that is checked by the non-compat version of TIOCGSERIAL.

Fix this by checking the correct function pointer.

Fixes: 77654350 ("take compat TIOC[SG]SERIAL treatment into tty_compat_ioctl()")
Cc: <stable@vger.kernel.org> # v4.20+
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Acked-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200224182044.234553-3-ebiggers@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17329563
...@@ -2734,7 +2734,7 @@ static int compat_tty_tiocgserial(struct tty_struct *tty, ...@@ -2734,7 +2734,7 @@ static int compat_tty_tiocgserial(struct tty_struct *tty,
memset(&v, 0, sizeof(v)); memset(&v, 0, sizeof(v));
memset(&v32, 0, sizeof(v32)); memset(&v32, 0, sizeof(v32));
if (!tty->ops->set_serial) if (!tty->ops->get_serial)
return -ENOTTY; return -ENOTTY;
err = tty->ops->get_serial(tty, &v); err = tty->ops->get_serial(tty, &v);
if (!err) { if (!err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment