lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 056/158] media: uvcvideo: Fix access to uninitialized fields on probe error
    Date
    From: Oliver Neukum <oneukum@suse.com>

    [ Upstream commit 11a087f484bf15ff65f0a9f277aa5a61fd07ed2a ]

    We need to check whether this work we are canceling actually is
    initialized.

    Signed-off-by: Oliver Neukum <oneukum@suse.com>
    Reported-by: syzbot+2e1ef9188251d9cc7944@syzkaller.appspotmail.com
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/uvc/uvc_ctrl.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
    index 467b1ddaf4e7..f2854337cdca 100644
    --- a/drivers/media/usb/uvc/uvc_ctrl.c
    +++ b/drivers/media/usb/uvc/uvc_ctrl.c
    @@ -2350,7 +2350,9 @@ void uvc_ctrl_cleanup_device(struct uvc_device *dev)
    struct uvc_entity *entity;
    unsigned int i;

    - cancel_work_sync(&dev->async_ctrl.work);
    + /* Can be uninitialized if we are aborting on probe error. */
    + if (dev->async_ctrl.work.func)
    + cancel_work_sync(&dev->async_ctrl.work);

    /* Free controls and control mappings for all entities. */
    list_for_each_entry(entity, &dev->entities, list) {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 17:45    [W:4.600 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site