Merge 3.7-rc3 into tty-next

This merges the tty changes in 3.7-rc3 into tty-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 89cf6014a967..e2f57a007029 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);