lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 61/93] media: v4l2-compat-ioctl32.c: move helper functions to __get/put_v4l2_format32
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hans Verkuil <hans.verkuil@cisco.com>

    commit 486c521510c44a04cd756a9267e7d1e271c8a4ba upstream.

    These helper functions do not really help. Move the code to the
    __get/put_v4l2_format32 functions.

    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 84 ++++----------------------
    1 file changed, 16 insertions(+), 68 deletions(-)

    --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
    +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
    @@ -89,64 +89,6 @@ static int put_v4l2_window32(struct v4l2
    return 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;
    -}
    -
    struct v4l2_format32 {
    __u32 type; /* enum v4l2_buf_type */
    union {
    @@ -184,20 +126,23 @@ static int __get_v4l2_format32(struct v4
    switch (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;
    default:
    printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
    kp->type);
    @@ -225,20 +170,23 @@ static int __put_v4l2_format32(struct v4
    switch (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;
    default:
    printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
    kp->type);

    \
     
     \ /
      Last update: 2018-04-06 17:22    [W:2.354 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site