media: v4l2-dev: fix media controller registration error handling
PATCH 1/1 media: v4l2-dev: fix media controller registration error handling
__video_register_device() registers the media-controller entity and interface after cdev_add() and device_register().
The return value from video_register_media_controller() is currently ignored. If media_devnode_create() fails, vdev->intf_devnode remains NULL, but the video device is still marked as registered and the caller sees a successful registration. A later video_unregister_device() reaches v4l2_device_release(), which calls media_devnode_remove() and dereferences that NULL pointer.
If media_create_intf_link() fails, the helper removes vdev->intf_devnode but leaves the stale pointer behind. A later release path may then try to remove it again.
Fix this by propagating video_register_media_controller() failures from __video_register_device(). Also make the media-controller cleanup path tolerate partially-created state by clearing vdev->intf_devnode after removal and checking it before release-time removal.
--- drivers/media/v4l2-core/v4l2-dev.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-dev.c +10 -1
@@ -203,7 +203,10 @@ static void v4l2_device_release(struct device *cd)#if defined(CONFIG_MEDIA_CONTROLLER )if (v4l2_dev->mdev && vdev->vfl_dir !=VFL_DIR_M2M ) {/* Remove interfaces and interface links */ -media_devnode_remove (vdev->intf_devnode); +if (vdev->intf_devnode) { +media_devnode_remove (vdev->intf_devnode); + vdev->intf_devnode =NULL ; + }if (vdev->entity.function !=MEDIA_ENT_F_UNKNOWN )media_device_unregister_entity (&vdev->entity); }
@@ -896,6 +899,7 @@ static int video_register_media_controller(struct video_device *vdev) MEDIA_LNK_FL_IMMUTABLE);if (!link) {media_devnode_remove (vdev->intf_devnode); + vdev->intf_devnode =NULL ;media_device_unregister_entity (&vdev->entity);return -ENOMEM ; }
@@ -1087,6 +1091,11 @@ int __video_register_device(struct video_device *vdev,/* Part 5: Register the entity. */ ret =video_register_media_controller (vdev); +if (ret <0 ) { +mutex_unlock (&videodev_lock); +put_device (&vdev->dev); +return ret; + }/* Part 6: Activate this minor. The char device can now be used. */ set_bit (V4L2_FL_REGISTERED , &vdev->flags);
Signature · 1 line
2.34.1
Quoted 29 lines · Shih-Sheng Yang
__video_register_device()registers the media-controller entity and interface aftercdev_add()anddevice_register().The return value from
video_register_media_controller()is currently ignored. Ifmedia_devnode_create()fails,vdev->intf_devnoderemains NULL, but the video device is still marked as registered and the caller sees a successful registration. A latervideo_unregister_device()reachesv4l2_device_release(), which callsmedia_devnode_remove()and dereferences that NULL pointer.If
media_create_intf_link()fails, the helper removesvdev->intf_devnodebut leaves the stale pointer behind. A later release path may then try to remove it again.Fix this by propagating
video_register_media_controller()failures from__video_register_device(). Also make the media-controller cleanup path tolerate partially-created state by clearingvdev->intf_devnodeafter removal and checking it before release-time removal.Signed-off-by Shih-Sheng Yang <[email protected]>--- drivers/media/v4l2-core/v4l2-dev.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/media/v4l2-core/v4l2-dev.c +0
-0
drivers/media/v4l2-core/v4l2-dev.c static void v4l2_device_release(struct device *cd) · line 207
Quoted 6 lines
drivers/media/v4l2-core/v4l2-dev.c +2
-1@@ -203,7 +203,10 @@ static void v4l2_device_release(struct device *cd)#if defined(CONFIG_MEDIA_CONTROLLER )if (v4l2_dev->mdev && vdev->vfl_dir !=VFL_DIR_M2M ) {/* Remove interfaces and interface links */ -media_devnode_remove (vdev->intf_devnode); +if (vdev->intf_devnode) { +media_devnode_remove (vdev->intf_devnode);
I'd move the NULL check to media_devnode_remove() and make this call unconditionally.
If we want to harden this more, media_devnode_remove() could take a struct media_intf_devnode **devnode parameters, and set
*devnode = NULL;
after freeing it. This is not a common pattern in the media subsystem though, but we may benefit from adopting it.
Quoted 14 lines
drivers/media/v4l2-core/v4l2-dev.c +3
-0+ vdev->intf_devnode =NULL ; + }if (vdev->entity.function !=MEDIA_ENT_F_UNKNOWN )media_device_unregister_entity (&vdev->entity); }@@ -896,6 +899,7 @@ static int video_register_media_controller(struct video_device *vdev) MEDIA_LNK_FL_IMMUTABLE);if (!link) {media_devnode_remove (vdev->intf_devnode); + vdev->intf_devnode =NULL ;media_device_unregister_entity (&vdev->entity);return -ENOMEM ; }
drivers/media/v4l2-core/v4l2-dev.c int __video_register_device(struct video_device *vdev, · line 1096
Quoted 6 lines
drivers/media/v4l2-core/v4l2-dev.c +3
-0@@ -1087,6 +1091,11 @@ int __video_register_device(struct video_device *vdev,/* Part 5: Register the entity. */ ret =video_register_media_controller (vdev); +if (ret <0 ) { +mutex_unlock (&videodev_lock); +put_device (&vdev->dev);
Where's the device unregistration ?
Quoted 5 lines
drivers/media/v4l2-core/v4l2-dev.c +2
-0+return ret; + }/* Part 6: Activate this minor. The char device can now be used. */ set_bit (V4L2_FL_REGISTERED , &vdev->flags);
Signature · 3 lines
Regards, Laurent Pinchart
Hi Laurent,
Thank you for the review.
I've addressed this in v2 by moving the NULL check into media_devnode_remove() and by using device_unregister() in __video_register_device(), as device_register() has already succeeded there.
I also checked the other media_devnode_remove() callers. I didn't find another caller with the same failure pattern or an immediate risk that requires changing the helper API. Since changing media_devnode_remove() to take a pointer-to-pointer would affect a wider set of callers, I have left that out of v2. I can add it if you prefer.
Regards,
Shih-Sheng
Quoted 9 lines · Shih-Sheng Yang
Hi Laurent,
Thank you for the review.
I've addressed this in v2 by moving the NULL check into
media_devnode_remove()and by usingdevice_unregister()in__video_register_device(), asdevice_register()has already succeeded there.
Quoted 5 lines
I also checked the other
media_devnode_remove()callers. I didn't find another caller with the same failure pattern or an immediate risk that requires changing the helper API. Since changingmedia_devnode_remove()to take a pointer-to-pointer would affect a wider set of callers, I have left that out of v2. I can add it if you prefer.
Sakari, Hans, to you have an opinion on that pattern ? If you forget the context, the idea is to turn
void media_devnode_remove(struct media_intf_devnode *devnode)
{
media_remove_intf_links(&devnode->intf);
media_gobj_destroy(&devnode->intf.graph_obj);
kfree(devnode);
}into
void media_devnode_remove(struct media_intf_devnode **devnode)
{
struct media_intf_devnode *node = *devnode;
if (!node)
return;
media_remove_intf_links(&node->intf);
media_gobj_destroy(&node->intf.graph_obj);
kfree(node);
*devnode = NULL;
}(bikeshedding on whether or not we need a local variable is left for later)
I think the pattern is safer, but it's not common in V4L2 at the moment.
Signature · 3 lines
Regards, Laurent Pinchart