diff options
| author | Oliver Neukum <oneukum@suse.com> | 2019-05-09 04:57:09 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-05-28 12:26:11 -0400 |
| commit | eff73de2b1600ad8230692f00bc0ab49b166512a (patch) | |
| tree | 38d309e888039ef6d5eedfe77a77048245a69840 /drivers/media/usb/cpia2/cpia2_usb.c | |
| parent | a82c3149ad8b4a84f9737a633250815d5cf0cc5e (diff) | |
| download | blackbird-op-linux-eff73de2b1600ad8230692f00bc0ab49b166512a.tar.gz blackbird-op-linux-eff73de2b1600ad8230692f00bc0ab49b166512a.zip | |
media: cpia2_usb: first wake up, then free in disconnect
Kasan reported a use after free in cpia2_usb_disconnect()
It first freed everything and then woke up those waiting.
The reverse order is correct.
Fixes: 6c493f8b28c67 ("[media] cpia2: major overhaul to get it in a working state again")
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Reported-by: syzbot+0c90fc937c84f97d0aa6@syzkaller.appspotmail.com
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/usb/cpia2/cpia2_usb.c')
| -rw-r--r-- | drivers/media/usb/cpia2/cpia2_usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c index e5d8dee38fe4..44bd7e5ad3eb 100644 --- a/drivers/media/usb/cpia2/cpia2_usb.c +++ b/drivers/media/usb/cpia2/cpia2_usb.c @@ -902,7 +902,6 @@ static void cpia2_usb_disconnect(struct usb_interface *intf) cpia2_unregister_camera(cam); v4l2_device_disconnect(&cam->v4l2_dev); mutex_unlock(&cam->v4l2_lock); - v4l2_device_put(&cam->v4l2_dev); if(cam->buffers) { DBG("Wakeup waiting processes\n"); @@ -911,6 +910,8 @@ static void cpia2_usb_disconnect(struct usb_interface *intf) wake_up_interruptible(&cam->wq_stream); } + v4l2_device_put(&cam->v4l2_dev); + LOG("CPiA2 camera disconnected.\n"); } |
