]> git.hungrycats.org Git - linux/commitdiff
media: v4l2-compat-ioctl32: initialize a reserved field
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 28 Mar 2018 18:12:37 +0000 (15:12 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 8 Apr 2018 09:49:47 +0000 (11:49 +0200)
The get_v4l2_create32() function is missing a logic with
would be cleaning a reserved field, causing v4l2-compliance
to complain:

 Buffer ioctls (Input 0):
fail: v4l2-test-buffers.cpp(506): check_0(crbufs.reserved, sizeof(crbufs.reserved))
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: FAIL

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/v4l2-core/v4l2-compat-ioctl32.c

index c76438dd3eadd20c267cef1af3402ac73940aad6..ca0a43ad4ec8ab2cdd9933b39457a33981250893 100644 (file)
@@ -247,7 +247,8 @@ static int get_v4l2_create32(struct v4l2_create_buffers __user *kp,
 {
        if (!access_ok(VERIFY_READ, up, sizeof(*up)) ||
            copy_in_user(kp, up,
-                        offsetof(struct v4l2_create_buffers32, format)))
+                        offsetof(struct v4l2_create_buffers32, format)) ||
+           copy_in_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
                return -EFAULT;
        return __get_v4l2_format32(&kp->format, &up->format,
                                   aux_buf, aux_space);