diff options
author | Kees Cook <keescook@chromium.org> | 2012-10-26 00:38:16 +0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-11 01:11:24 +0400 |
commit | fabe66bd6a4683f802b3cc6ec59579effb1afc41 (patch) | |
tree | 37abcee16b91f46c2531d43e2a26d57ce98d5688 /fs | |
parent | 356ad39592cfcb537a512b2f88ed44380ae5cd78 (diff) | |
download | linux-fabe66bd6a4683f802b3cc6ec59579effb1afc41.tar.xz |
fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check
commit 12176503366885edd542389eed3aaf94be163fdb upstream.
The compat ioctl for VIDEO_SET_SPU_PALETTE was missing an error check
while converting ioctl arguments. This could lead to leaking kernel
stack contents into userspace.
Patch extracted from existing fix in grsecurity.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: David Miller <davem@davemloft.net>
Cc: Brad Spengler <spender@grsecurity.net>
Cc: PaX Team <pageexec@freemail.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 641640dc7ae5..7a00d9b155bf 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -227,6 +227,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd, err = get_user(palp, &up->palette); err |= get_user(length, &up->length); + if (err) + return -EFAULT; up_native = compat_alloc_user_space(sizeof(struct video_spu_palette)); err = put_user(compat_ptr(palp), &up_native->palette); |