compat: fix 4-byte infoleak via uninitialized struct field
commit1c2117b6ee880d70dbed1845e187225303317928
authorJann Horn <jannh@google.com>
Fri, 11 May 2018 00:19:01 +0000 (11 02:19 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 May 2018 08:12:28 +0000 (16 10:12 +0200)
tree1bd8df78e10f581f9ce9e4983512df9404d3ed2a
parentc38ba2d8ea6a40451056d14c9baac00954beb82f
compat: fix 4-byte infoleak via uninitialized struct field

commit 0a0b98734479aa5b3c671d5190e86273372cab95 upstream.

Commit 3a4d44b61625 ("ntp: Move adjtimex related compat syscalls to
native counterparts") removed the memset() in compat_get_timex().  Since
then, the compat adjtimex syscall can invoke do_adjtimex() with an
uninitialized ->tai.

If do_adjtimex() doesn't write to ->tai (e.g.  because the arguments are
invalid), compat_put_timex() then copies the uninitialized ->tai field
to userspace.

Fix it by adding the memset() back.

Fixes: 3a4d44b61625 ("ntp: Move adjtimex related compat syscalls to native counterparts")
Signed-off-by: Jann Horn <jannh@google.com>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/compat.c