Commit baf43c6e authored Mar 14, 2016 by Tiffany Lin Committed by Mauro Carvalho Chehab Apr 13, 2016

[media] media: v4l2-compat-ioctl32: fix missing reserved field copy in put_v4l2_create32



In v4l2-compliance utility, test VIDIOC_CREATE_BUFS will check whether reserved
filed of v4l2_create_buffers filled with zero
Reserved field is filled with zero in v4l_create_bufs.
This patch copy reserved field of v4l2_create_buffer from kernel space to user
space

Signed-off-by: Tiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v3.19 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 2a518f8e

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)) \|\|
		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);
		}