lkml.org 
[lkml]   [2016]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] uvc_v4l2: One function call less in uvc_ioctl_ctrl_map() after error detection
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 19 Aug 2016 11:00:38 +0200

    The kfree() function was called in two cases by the uvc_ioctl_ctrl_map()
    function during error handling even if the passed data structure element
    contained a null pointer.

    Adjust jump targets according to the Linux coding style convention.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/media/usb/uvc/uvc_v4l2.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
    index a7e12fd..52a2af8 100644
    --- a/drivers/media/usb/uvc/uvc_v4l2.c
    +++ b/drivers/media/usb/uvc/uvc_v4l2.c
    @@ -66,14 +66,14 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
    if (xmap->menu_count == 0 ||
    xmap->menu_count > UVC_MAX_CONTROL_MENU_ENTRIES) {
    ret = -EINVAL;
    - goto done;
    + goto free_map;
    }

    size = xmap->menu_count * sizeof(*map->menu_info);
    map->menu_info = memdup_user(xmap->menu_info, size);
    if (IS_ERR(map->menu_info)) {
    ret = PTR_ERR(map->menu_info);
    - goto done;
    + goto free_map;
    }

    map->menu_count = xmap->menu_count;
    @@ -83,13 +83,12 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
    uvc_trace(UVC_TRACE_CONTROL, "Unsupported V4L2 control type "
    "%u.\n", xmap->v4l2_type);
    ret = -ENOTTY;
    - goto done;
    + goto free_map;
    }

    ret = uvc_ctrl_add_mapping(chain, map);
    -
    -done:
    kfree(map->menu_info);
    +free_map:
    kfree(map);

    return ret;
    --
    2.9.3
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:4.173 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site