openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: stk-webcam: Fix use after free on disconnect 

We free the stk_camera device too early.  It's allocate first in probe
and it should be freed last in stk_camera_disconnect().

Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Dan Carpenter 2017-09-22 09:48:41 -04:00 committed by Mauro Carvalho Chehab
parent c0f71bbb81
commit 6e298d5847
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/stkwebcam/stk-webcam.c
View File

@ -1241,7 +1241,6 @@ static void stk_v4l_dev_release(struct video_device *vd)
if (dev->sio_bufs != NULL || dev->isobufs != NULL) if (dev->sio_bufs != NULL || dev->isobufs != NULL)
pr_err("We are leaking memory\n"); pr_err("We are leaking memory\n");
usb_put_intf(dev->interface); usb_put_intf(dev->interface);
kfree(dev);
} }
static const struct video_device stk_v4l_data = { static const struct video_device stk_v4l_data = {
@ -1391,6 +1390,7 @@ static void stk_camera_disconnect(struct usb_interface *interface)
video_unregister_device(&dev->vdev); video_unregister_device(&dev->vdev);
v4l2_ctrl_handler_free(&dev->hdl); v4l2_ctrl_handler_free(&dev->hdl);
v4l2_device_unregister(&dev->v4l2_dev); v4l2_device_unregister(&dev->v4l2_dev);
kfree(dev);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM