Merge tag 'lsk-v4.4-16.06-android'

[firefly-linux-kernel-4.4.55.git] / drivers / media / v4l2-core / v4l2-compat-ioctl32.c

diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index 7f6f927cb98e3b2a61a1fafeb6ab55c3136b7acd..dd94c675bcab5c258e7020275e76993bef8e8e02 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -280,7 +280,8 @@ static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user
 static int put_v4l2_create32(struct v4l2_create_buffers *kp, struct v4l2_create_buffers32 __user *up)
 {
        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_create_buffers32)) ||
 static int put_v4l2_create32(struct v4l2_create_buffers *kp, struct v4l2_create_buffers32 __user *up)
 {
        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_create_buffers32)) ||

-           copy_to_user(up, kp, offsetof(struct v4l2_create_buffers32, format)))
+           copy_to_user(up, kp, offsetof(struct v4l2_create_buffers32, format)) ||
+           copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))

                return -EFAULT;
        return __put_v4l2_format32(&kp->format, &up->format);
 }
                return -EFAULT;
        return __put_v4l2_format32(&kp->format, &up->format);
 }