diff options
| author | Oliver Neukum | 2019-04-30 14:28:14 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2019-06-11 18:22:21 +0200 |
| commit | 11a087f484bf15ff65f0a9f277aa5a61fd07ed2a (patch) | |
| tree | 1406eda106a41705a55adbe0b6e87ccc4415219e | |
| parent | media: uvcvideo: Include streaming interface number in debugfs dir name (diff) | |
| download | kernel-qcow2-linux-11a087f484bf15ff65f0a9f277aa5a61fd07ed2a.tar.gz kernel-qcow2-linux-11a087f484bf15ff65f0a9f277aa5a61fd07ed2a.tar.xz kernel-qcow2-linux-11a087f484bf15ff65f0a9f277aa5a61fd07ed2a.zip | |
media: uvcvideo: Fix access to uninitialized fields on probe error
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>
| -rw-r--r-- | drivers/media/usb/uvc/uvc_ctrl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 26163a5bde7d..e399b9fad757 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2345,7 +2345,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) { |