lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 127/140] media: v4l2-ioctl.c: don't copy back the result for -ENOTTY
    3.2.100-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Hans Verkuil <hverkuil@xs4all.nl>

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

    commit 181a4a2d5a0a7b43cab08a70710d727e7764ccdd upstream.

    If the ioctl returned -ENOTTY, then don't bother copying
    back the result as there is no point.

    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: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/media/video/v4l2-ioctl.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
    index 639abeee3392..bae5dd776d82 100644
    --- a/drivers/media/video/v4l2-ioctl.c
    +++ b/drivers/media/video/v4l2-ioctl.c
    @@ -2308,8 +2308,10 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,

    /* Handles IOCTL */
    err = func(file, cmd, parg);
    - if (err == -ENOIOCTLCMD)
    - err = -EINVAL;
    + if (err == -ENOTTY || err == -ENOIOCTLCMD) {
    + err = -ENOTTY;
    + goto out;
    + }

    if (has_array_args) {
    *kernel_ptr = user_ptr;
    \
     
     \ /
      Last update: 2018-02-28 18:44    [W:2.472 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site