Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7df5ab87 authored by Tiffany Lin's avatar Tiffany Lin Committed by Mauro Carvalho Chehab
Browse files

[media] media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32 



In v4l2-compliance utility, test QUERYBUF required correct length
value to go through each planar to check planar's length in
multi-planar buffer type

Signed-off-by: default avatarTiffany Lin <tiffany.lin@mediatek.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v3.7 and up
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 49fe7340

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

+8 −13
Original line number Diff line number Diff line
@@ -415,7 +415,8 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user 
		get_user(kp->index, &up->index) ||

		get_user(kp->type, &up->type) ||

		get_user(kp->flags, &up->flags) ||

		get_user(kp->memory, &up->memory))

		get_user(kp->memory, &up->memory) ||

		get_user(kp->length, &up->length))

			return -EFAULT;



	if (V4L2_TYPE_IS_OUTPUT(kp->type))
@@ -427,9 +428,6 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user 
			return -EFAULT;



	if (V4L2_TYPE_IS_MULTIPLANAR(kp->type)) {

		if (get_user(kp->length, &up->length))

			return -EFAULT;



		num_planes = kp->length;

		if (num_planes == 0) {

			kp->m.planes = NULL;
@@ -462,16 +460,14 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user 
	} else {

		switch (kp->memory) {

		case V4L2_MEMORY_MMAP:

			if (get_user(kp->length, &up->length) ||

				get_user(kp->m.offset, &up->m.offset))

			if (get_user(kp->m.offset, &up->m.offset))

				return -EFAULT;

			break;

		case V4L2_MEMORY_USERPTR:

			{

			compat_long_t tmp;



			if (get_user(kp->length, &up->length) ||

			    get_user(tmp, &up->m.userptr))

			if (get_user(tmp, &up->m.userptr))

				return -EFAULT;



			kp->m.userptr = (unsigned long)compat_ptr(tmp);
@@ -513,7 +509,8 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user 
		copy_to_user(&up->timecode, &kp->timecode, sizeof(struct v4l2_timecode)) ||

		put_user(kp->sequence, &up->sequence) ||

		put_user(kp->reserved2, &up->reserved2) ||

		put_user(kp->reserved, &up->reserved))

		put_user(kp->reserved, &up->reserved) ||

		put_user(kp->length, &up->length))

			return -EFAULT;



	if (V4L2_TYPE_IS_MULTIPLANAR(kp->type)) {
@@ -536,13 +533,11 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user 
	} else {

		switch (kp->memory) {

		case V4L2_MEMORY_MMAP:

			if (put_user(kp->length, &up->length) ||

				put_user(kp->m.offset, &up->m.offset))

			if (put_user(kp->m.offset, &up->m.offset))

				return -EFAULT;

			break;

		case V4L2_MEMORY_USERPTR:

			if (put_user(kp->length, &up->length) ||

				put_user(kp->m.userptr, &up->m.userptr))

			if (put_user(kp->m.userptr, &up->m.userptr))

				return -EFAULT;

			break;

		case V4L2_MEMORY_OVERLAY: