iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] exynos4-is: Add locking at fimc(-lite) subdev unregistered handler

Browse Source 
Protect the fimc/fimc-lite video nodes unregistration with their video
lock. This prevents a kernel crash when e.g. udev opens a video node
right after the driver registers it and then the driver tries to
unregister it and defers its probing. Using video_is_unregistered()
together with the video mutex allows safe unregistration of the video
nodes at any time.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sylwester Nawrocki 2013-05-31 11:37:25 -03:00 committed by Mauro Carvalho Chehab
parent 52917bcbe0
commit 26d63d13da
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/exynos4-is/fimc-capture.c
View File

@ -1855,6 +1855,8 @@ static void fimc_capture_subdev_unregistered(struct v4l2_subdev *sd)
if (fimc == NULL) if (fimc == NULL)
return; return;
mutex_lock(&fimc->lock);
fimc_unregister_m2m_device(fimc); fimc_unregister_m2m_device(fimc);
vdev = &fimc->vid_cap.ve.vdev; vdev = &fimc->vid_cap.ve.vdev;
@ -1866,6 +1868,8 @@ static void fimc_capture_subdev_unregistered(struct v4l2_subdev *sd)
} }
kfree(fimc->vid_cap.ctx); kfree(fimc->vid_cap.ctx);
fimc->vid_cap.ctx = NULL; fimc->vid_cap.ctx = NULL;
mutex_unlock(&fimc->lock);
} }
static const struct v4l2_subdev_internal_ops fimc_capture_sd_internal_ops = { static const struct v4l2_subdev_internal_ops fimc_capture_sd_internal_ops = {

4
drivers/media/platform/exynos4-is/fimc-lite.c
View File

@ -1300,11 +1300,15 @@ static void fimc_lite_subdev_unregistered(struct v4l2_subdev *sd)
if (fimc == NULL) if (fimc == NULL)
return; return;
mutex_lock(&fimc->lock);
if (video_is_registered(&fimc->ve.vdev)) { if (video_is_registered(&fimc->ve.vdev)) {
video_unregister_device(&fimc->ve.vdev); video_unregister_device(&fimc->ve.vdev);
media_entity_cleanup(&fimc->ve.vdev.entity); media_entity_cleanup(&fimc->ve.vdev.entity);
fimc->ve.pipe = NULL; fimc->ve.pipe = NULL;
} }
mutex_unlock(&fimc->lock);
} }
static const struct v4l2_subdev_internal_ops fimc_lite_subdev_internal_ops = { static const struct v4l2_subdev_internal_ops fimc_lite_subdev_internal_ops = {