Patch "media: v4l2-compat-ioctl32.c: copy m.userptr in put_v4l2_plane32" has been added to the 4.15-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
media: v4l2-compat-ioctl32.c: copy m.userptr in put_v4l2_plane32
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-v4l2-compat-ioctl32.c-copy-m.userptr-in-put_v4l2_plane32.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
8ed5a59dcb47a6f76034ee760b36e089f3e82529Mon Sep 17 00:00:00 2001
From: Hans Verkuil <[email protected]>
Date: Wed, 24 Jan 2018 05:19:59 -0500
Subject: media: v4l2-compat-ioctl32.c: copy m.userptr in put_v4l2_plane32
From: Hans Verkuil <[email protected]>
commit 8ed5a59dcb47a6f76034ee760b36e089f3e82529 upstream.
The struct v4l2_plane32 should set m.userptr as well. The same happens in v4l2_buffer32 and v4l2-compliance tests for this.
--- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 47 +++++++++++++++----------- 1 file changed, 28 insertions(+), 19 deletions(-)
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +28 -19
@@ -310,19 +310,24 @@ static int get_v4l2_plane32(struct v4l2_ sizeof(up->data_offset)))return -EFAULT ; -if (memory ==V4L2_MEMORY_USERPTR ) { +switch (memory) { +case V4L2_MEMORY_MMAP : +case V4L2_MEMORY_OVERLAY : +if (copy_in_user (&up->m.mem_offset, &up32->m.mem_offset, +sizeof (up32->m.mem_offset))) +return -EFAULT ; +break ; +case V4L2_MEMORY_USERPTR :if (get_user (p, &up32->m.userptr))return -EFAULT ; up_pln =compat_ptr (p);if (put_user ((unsigned long )up_pln, &up->m.userptr))return -EFAULT ; - }else if (memory ==V4L2_MEMORY_DMABUF ) { +break ; +case V4L2_MEMORY_DMABUF :if (copy_in_user (&up->m.fd, &up32->m.fd,sizeof (up32->m.fd)))return -EFAULT ; - }else { -if (copy_in_user (&up->m.mem_offset, &up32->m.mem_offset, -sizeof (up32->m.mem_offset))) -return -EFAULT ; +break ; }return 0 ;
@@ -331,22 +336,32 @@ static int get_v4l2_plane32(struct v4l2_static int put_v4l2_plane32 (struct v4l2_plane __user *up,struct v4l2_plane32 __user *up32,enum v4l2_memory memory) { +unsigned long p; +if (copy_in_user (up32, up,2 *sizeof (__u32)) ||copy_in_user (&up32->data_offset, &up->data_offset,sizeof (up->data_offset)))return -EFAULT ; -/* For MMAP, driver might've set up the offset, so copy it back. -* USERPTR stays the same (was userspace-provided), so no copying. */ -if (memory ==V4L2_MEMORY_MMAP ) +switch (memory) { +case V4L2_MEMORY_MMAP : +case V4L2_MEMORY_OVERLAY :if (copy_in_user (&up32->m.mem_offset, &up->m.mem_offset,sizeof (up->m.mem_offset)))return -EFAULT ; -/* For DMABUF, driver might've set up the fd, so copy it back. */ -if (memory ==V4L2_MEMORY_DMABUF ) +break ; +case V4L2_MEMORY_USERPTR : +if (get_user (p, &up->m.userptr) || +put_user ((compat_ulong_t )ptr_to_compat ((__force void *)p), + &up32->m.userptr)) +return -EFAULT ; +break ; +case V4L2_MEMORY_DMABUF :if (copy_in_user (&up32->m.fd, &up->m.fd,sizeof (up->m.fd)))return -EFAULT ; +break ; + }return 0 ; }
@@ -408,6 +423,7 @@ static int get_v4l2_buffer32(struct v4l2 }else {switch (kp->memory) {case V4L2_MEMORY_MMAP : +case V4L2_MEMORY_OVERLAY :if (get_user (kp->m.offset, &up->m.offset))return -EFAULT ;break ;
@@ -421,10 +437,6 @@ static int get_v4l2_buffer32(struct v4l2 kp->m.userptr = (unsigned long )compat_ptr (tmp); }break ; -case V4L2_MEMORY_OVERLAY : -if (get_user (kp->m.offset, &up->m.offset)) -return -EFAULT ; -break ;case V4L2_MEMORY_DMABUF :if (get_user (kp->m.fd, &up->m.fd))return -EFAULT ;
@@ -481,6 +493,7 @@ static int put_v4l2_buffer32(struct v4l2 }else {switch (kp->memory) {case V4L2_MEMORY_MMAP : +case V4L2_MEMORY_OVERLAY :if (put_user (kp->m.offset, &up->m.offset))return -EFAULT ;break ;
@@ -488,10 +501,6 @@ static int put_v4l2_buffer32(struct v4l2if (put_user (kp->m.userptr, &up->m.userptr))return -EFAULT ;break ; -case V4L2_MEMORY_OVERLAY : -if (put_user (kp->m.offset, &up->m.offset)) -return -EFAULT ; -break ;case V4L2_MEMORY_DMABUF :if (put_user (kp->m.fd, &up->m.fd))return -EFAULT ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/media-hdpvr-fix-an-error-handling-path-in-hdpvr_probe.patch queue-4.15/media-v4l2-compat-ioctl32.c-copy-m.userptr-in-put_v4l2_plane32.patch queue-4.15/media-v4l2-compat-ioctl32.c-avoid-sizeof-type.patch queue-4.15/media-v4l2-compat-ioctl32.c-drop-pr_info-for-unknown-buffer-type.patch queue-4.15/media-v4l2-compat-ioctl32.c-add-missing-vidioc_prepare_buf.patch queue-4.15/media-v4l2-compat-ioctl32.c-refactor-compat-ioctl32-logic.patch queue-4.15/media-v4l2-compat-ioctl32.c-fix-ctrl_is_pointer.patch queue-4.15/media-v4l2-compat-ioctl32.c-move-helper-functions-to-__get-put_v4l2_format32.patch queue-4.15/media-v4l2-compat-ioctl32.c-don-t-copy-back-the-result-for-certain-errors.patch queue-4.15/media-v4l2-compat-ioctl32.c-make-ctrl_is_pointer-work-for-subdevs.patch queue-4.15/media-v4l2-compat-ioctl32.c-fix-the-indentation.patch queue-4.15/media-v4l2-ioctl.c-don-t-copy-back-the-result-for-enotty.patch queue-4.15/media-v4l2-ioctl.c-use-check_fmt-for-enum-g-s-try_fmt.patch queue-4.15/media-v4l2-compat-ioctl32.c-copy-clip-list-in-put_v4l2_window32.patch