Patch "media: v4l2-compat-ioctl32.c: copy clip list in put_v4l2_window32" 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 clip list in put_v4l2_window32
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-clip-list-in-put_v4l2_window32.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
a751be5b142ef6bcbbb96d9899516f4d9c8d0ef4Mon Sep 17 00:00:00 2001
From: Hans Verkuil <[email protected]>
Date: Wed, 24 Jan 2018 06:03:08 -0500
Subject: media: v4l2-compat-ioctl32.c: copy clip list in put_v4l2_window32
From: Hans Verkuil <[email protected]>
commit a751be5b142ef6bcbbb96d9899516f4d9c8d0ef4 upstream.
put_v4l2_window32() didn't copy back the clip list to userspace. Drivers can update the clip rectangles, so this should be done.
--- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 59 +++++++++++++++++--------- 1 file changed, 40 insertions(+), 19 deletions(-)
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +40 -19
@@ -50,6 +50,11 @@ struct v4l2_window32 {static int get_v4l2_window32 (struct v4l2_window *kp,struct v4l2_window32 __user *up) { +struct v4l2_clip32 __user *uclips; +struct v4l2_clip __user *kclips; +compat_caddr_t p; +u32 n; + if (!access_ok(VERIFY_READ, up, sizeof(*up)) || copy_from_user(&kp->w, &up->w, sizeof(up->w)) || get_user(kp->field, &up->field) ||
@@ -59,38 +64,54 @@ static int get_v4l2_window32(struct v4l2return -EFAULT ;if (kp->clipcount >2048 )return -EINVAL ; -if (kp->clipcount) { -struct v4l2_clip32 __user *uclips; -struct v4l2_clip __user *kclips; -int n = kp->clipcount; -compat_caddr_t p; +if (!kp->clipcount) { + kp->clips =NULL ; +return 0 ; + } -if (get_user (p, &up->clips)) + n = kp->clipcount; +if (get_user (p, &up->clips)) +return -EFAULT ; + uclips =compat_ptr (p); + kclips =compat_alloc_user_space (n *sizeof (*kclips)); + kp->clips = kclips; +while (n--) { +if (copy_in_user (&kclips->c, &uclips->c,sizeof (uclips->c)))return -EFAULT ; - uclips =compat_ptr (p); - kclips =compat_alloc_user_space (n *sizeof (*kclips)); - kp->clips = kclips; -while (--n >=0 ) { -if (copy_in_user (&kclips->c, &uclips->c,sizeof (uclips->c))) -return -EFAULT ; -if (put_user (n ? kclips +1 :NULL , &kclips->next)) -return -EFAULT ; - uclips +=1 ; - kclips +=1 ; - } - }else - kp->clips =NULL ; +if (put_user (n ? kclips +1 :NULL , &kclips->next)) +return -EFAULT ; + uclips++; + kclips++; + }return 0 ; }static int put_v4l2_window32 (struct v4l2_window *kp,struct v4l2_window32 __user *up) { +struct v4l2_clip __user *kclips = kp->clips; +struct v4l2_clip32 __user *uclips; +u32 n = kp->clipcount; +compat_caddr_t p; +if (copy_to_user (&up->w, &kp->w,sizeof (kp->w)) ||put_user (kp->field, &up->field) ||put_user (kp->chromakey, &up->chromakey) ||put_user (kp->clipcount, &up->clipcount) ||put_user (kp->global_alpha, &up->global_alpha))return -EFAULT ; + +if (!kp->clipcount) +return 0 ; + +if (get_user (p, &up->clips)) +return -EFAULT ; + uclips =compat_ptr (p); +while (n--) { +if (copy_in_user (&uclips->c, &kclips->c,sizeof (uclips->c))) +return -EFAULT ; + uclips++; + kclips++; + }return 0 ; }
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