From patchwork Thu Nov 22 04:50:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.yuz, extended, stable] Patch "fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check" has been added to staging queue Date: Wed, 21 Nov 2012 18:50:46 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 201014 Message-Id: <1353559846-4347-1-git-send-email-herton.krzesinski@canonical.com> To: Kees Cook Cc: Brad Spengler , kernel-team@lists.ubuntu.com, PaX Team , Andrew Morton , Linus Torvalds , David Miller This is a note to let you know that I have just added a patch titled fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.yuz tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From db659937235074b6575789a1f0cddae73a886d9d Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Thu, 25 Oct 2012 13:38:16 -0700 Subject: [PATCH] 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 Cc: David Miller Cc: Brad Spengler Cc: PaX Team Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Herton Ronaldo Krzesinski --- fs/compat_ioctl.c | 2 ++ 1 file changed, 2 insertions(+) -- 1.7.9.5 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index debdfe0..5d2069f 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -210,6 +210,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);