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

Signed-off-by: Oliver Neukum <oneu...@suse.com>
Reported-by: syzbot+2e1ef9188251d9cc7...@syzkaller.appspotmail.com
---
 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 14cff91b7aea..2b510c56cf91 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.16.4

Reply via email to