lkml.org 
[lkml]   [2020]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] tty: fix compat TIOCGSERIAL leaking uninitialized memory
Date
From: Eric Biggers <ebiggers@google.com>

Commit 77654350306a ("take compat TIOC[SG]SERIAL treatment into
tty_compat_ioctl()") changed the compat version of TIOCGSERIAL to start
copying a whole struct to userspace rather than individual fields, but
failed to initialize all padding and fields -- namely the hole after the
'iomem_reg_shift' field, and the 'reserved' field.

Fix this by initializing the struct to zero.

Reported-by: syzbot+8da9175e28eadcb203ce@syzkaller.appspotmail.com
Fixes: 77654350306a ("take compat TIOC[SG]SERIAL treatment into tty_compat_ioctl()")
Cc: <stable@vger.kernel.org> # v4.20+
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
drivers/tty/tty_io.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 1fcf7ad83dfa0..d24c250312edf 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2731,6 +2731,7 @@ static int compat_tty_tiocgserial(struct tty_struct *tty,
struct serial_struct v;
int err;
memset(&v, 0, sizeof(struct serial_struct));
+ memset(&v32, 0, sizeof(struct serial_struct32));

if (!tty->ops->set_serial)
return -ENOTTY;
--
2.25.1
\
 
 \ /
  Last update: 2020-02-24 09:39    [W:0.047 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site