Patch "media: v4l2-compat-ioctl32.c: move 'helper' functions to __get/put_v4l2_format32" 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: move 'helper' functions to __get/put_v4l2_format32
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-move-helper-functions-to-__get-put_v4l2_format32.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
486c521510c44a04cd756a9267e7d1e271c8a4baMon Sep 17 00:00:00 2001
From: Hans Verkuil <[email protected]>
Date: Wed, 24 Jan 2018 04:45:29 -0500
Subject: media: v4l2-compat-ioctl32.c: move 'helper' functions to __get/put_v4l2_format32
From: Hans Verkuil <[email protected]>
commit 486c521510c44a04cd756a9267e7d1e271c8a4ba upstream.
These helper functions do not really help. Move the code to the __get/put_v4l2_format32 functions.
--- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 124 +++++--------------------- 1 file changed, 24 insertions(+), 100 deletions(-)
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +24 -100
@@ -92,92 +92,6 @@ static int put_v4l2_window32(struct v4l2return 0 ; } -static inline int get_v4l2_pix_format (struct v4l2_pix_format *kp,struct v4l2_pix_format __user *up) -{ -if (copy_from_user (kp, up,sizeof (struct v4l2_pix_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int get_v4l2_pix_format_mplane (struct v4l2_pix_format_mplane *kp, -struct v4l2_pix_format_mplane __user *up) -{ -if (copy_from_user (kp, up,sizeof (struct v4l2_pix_format_mplane ))) -return -EFAULT ; -return 0 ; -} - -static inline int put_v4l2_pix_format (struct v4l2_pix_format *kp,struct v4l2_pix_format __user *up) -{ -if (copy_to_user (up, kp,sizeof (struct v4l2_pix_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int put_v4l2_pix_format_mplane (struct v4l2_pix_format_mplane *kp, -struct v4l2_pix_format_mplane __user *up) -{ -if (copy_to_user (up, kp,sizeof (struct v4l2_pix_format_mplane ))) -return -EFAULT ; -return 0 ; -} - -static inline int get_v4l2_vbi_format (struct v4l2_vbi_format *kp,struct v4l2_vbi_format __user *up) -{ -if (copy_from_user (kp, up,sizeof (struct v4l2_vbi_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int put_v4l2_vbi_format (struct v4l2_vbi_format *kp,struct v4l2_vbi_format __user *up) -{ -if (copy_to_user (up, kp,sizeof (struct v4l2_vbi_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int get_v4l2_sliced_vbi_format (struct v4l2_sliced_vbi_format *kp,struct v4l2_sliced_vbi_format __user *up) -{ -if (copy_from_user (kp, up,sizeof (struct v4l2_sliced_vbi_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int put_v4l2_sliced_vbi_format (struct v4l2_sliced_vbi_format *kp,struct v4l2_sliced_vbi_format __user *up) -{ -if (copy_to_user (up, kp,sizeof (struct v4l2_sliced_vbi_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int get_v4l2_sdr_format (struct v4l2_sdr_format *kp,struct v4l2_sdr_format __user *up) -{ -if (copy_from_user (kp, up,sizeof (struct v4l2_sdr_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int put_v4l2_sdr_format (struct v4l2_sdr_format *kp,struct v4l2_sdr_format __user *up) -{ -if (copy_to_user (up, kp,sizeof (struct v4l2_sdr_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int get_v4l2_meta_format (struct v4l2_meta_format *kp,struct v4l2_meta_format __user *up) -{ -if (copy_from_user (kp, up,sizeof (struct v4l2_meta_format ))) -return -EFAULT ; -return 0 ; -} - -static inline int put_v4l2_meta_format (struct v4l2_meta_format *kp,struct v4l2_meta_format __user *up) -{ -if (copy_to_user (up, kp,sizeof (struct v4l2_meta_format ))) -return -EFAULT ; -return 0 ; -} -struct v4l2_format32 {__u32 type;/* enum v4l2_buf_type */ union {
@@ -217,25 +131,30 @@ static int __get_v4l2_format32(struct v4switch (kp->type) {case V4L2_BUF_TYPE_VIDEO_CAPTURE :case V4L2_BUF_TYPE_VIDEO_OUTPUT : -return get_v4l2_pix_format (&kp->fmt.pix, &up->fmt.pix); +return copy_from_user (&kp->fmt.pix, &up->fmt.pix, +sizeof (kp->fmt.pix)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE : -return get_v4l2_pix_format_mplane (&kp->fmt.pix_mp, - &up->fmt.pix_mp); +return copy_from_user (&kp->fmt.pix_mp, &up->fmt.pix_mp, +sizeof (kp->fmt.pix_mp)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_VIDEO_OVERLAY :case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY :return get_v4l2_window32 (&kp->fmt.win, &up->fmt.win);case V4L2_BUF_TYPE_VBI_CAPTURE :case V4L2_BUF_TYPE_VBI_OUTPUT : -return get_v4l2_vbi_format (&kp->fmt.vbi, &up->fmt.vbi); +return copy_from_user (&kp->fmt.vbi, &up->fmt.vbi, +sizeof (kp->fmt.vbi)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE :case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT : -return get_v4l2_sliced_vbi_format (&kp->fmt.sliced, &up->fmt.sliced); +return copy_from_user (&kp->fmt.sliced, &up->fmt.sliced, +sizeof (kp->fmt.sliced)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_SDR_CAPTURE :case V4L2_BUF_TYPE_SDR_OUTPUT : -return get_v4l2_sdr_format (&kp->fmt.sdr, &up->fmt.sdr); +return copy_from_user (&kp->fmt.sdr, &up->fmt.sdr, +sizeof (kp->fmt.sdr)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_META_CAPTURE : -return get_v4l2_meta_format (&kp->fmt.meta, &up->fmt.meta); +return copy_from_user (&kp->fmt.meta, &up->fmt.meta, +sizeof (kp->fmt.meta)) ? -EFAULT :0 ;default :pr_info ("compat_ioctl32: unexpected VIDIOC_FMT type %d\n" , kp->type);
@@ -266,25 +185,30 @@ static int __put_v4l2_format32(struct v4switch (kp->type) {case V4L2_BUF_TYPE_VIDEO_CAPTURE :case V4L2_BUF_TYPE_VIDEO_OUTPUT : -return put_v4l2_pix_format (&kp->fmt.pix, &up->fmt.pix); +return copy_to_user (&up->fmt.pix, &kp->fmt.pix, +sizeof (kp->fmt.pix)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE : -return put_v4l2_pix_format_mplane (&kp->fmt.pix_mp, - &up->fmt.pix_mp); +return copy_to_user (&up->fmt.pix_mp, &kp->fmt.pix_mp, +sizeof (kp->fmt.pix_mp)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_VIDEO_OVERLAY :case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY :return put_v4l2_window32 (&kp->fmt.win, &up->fmt.win);case V4L2_BUF_TYPE_VBI_CAPTURE :case V4L2_BUF_TYPE_VBI_OUTPUT : -return put_v4l2_vbi_format (&kp->fmt.vbi, &up->fmt.vbi); +return copy_to_user (&up->fmt.vbi, &kp->fmt.vbi, +sizeof (kp->fmt.vbi)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE :case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT : -return put_v4l2_sliced_vbi_format (&kp->fmt.sliced, &up->fmt.sliced); +return copy_to_user (&up->fmt.sliced, &kp->fmt.sliced, +sizeof (kp->fmt.sliced)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_SDR_CAPTURE :case V4L2_BUF_TYPE_SDR_OUTPUT : -return put_v4l2_sdr_format (&kp->fmt.sdr, &up->fmt.sdr); +return copy_to_user (&up->fmt.sdr, &kp->fmt.sdr, +sizeof (kp->fmt.sdr)) ? -EFAULT :0 ;case V4L2_BUF_TYPE_META_CAPTURE : -return put_v4l2_meta_format (&kp->fmt.meta, &up->fmt.meta); +return copy_to_user (&up->fmt.meta, &kp->fmt.meta, +sizeof (kp->fmt.meta)) ? -EFAULT :0 ;default :pr_info ("compat_ioctl32: unexpected VIDIOC_FMT type %d\n" , kp->type);
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