summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-25 13:38:16 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-31 09:51:34 -0700
commitab41bb2e47540a714271dfa2943566b1fd4afa9c (patch)
tree6f86e5c2ac174c1bdb60d21d0240d855fe04843d
parented12438d94ded9c028570776898418adbb497f58 (diff)
downloadlinux-stable-ab41bb2e47540a714271dfa2943566b1fd4afa9c.tar.gz
linux-stable-ab41bb2e47540a714271dfa2943566b1fd4afa9c.tar.bz2
linux-stable-ab41bb2e47540a714271dfa2943566b1fd4afa9c.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/compat_ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 61abb638b4bf..3deb58d086b7 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -208,6 +208,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);