summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2016-03-21 04:33:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-27 16:40:24 +0200
commit46522c641eb5212172d7f0b34c56c42e89692fa3 (patch)
tree2cbeca05d90510be4d34a1fc4c6f0cd231a7d46e /drivers/media
parentc4cbdb763ae30989a19b5936611f10e4110fd070 (diff)
media-devnode: add missing mutex lock in error handler
commit 88336e174645948da269e1812f138f727cd2896b upstream. We should protect the device unregister patch too, at the error condition. Signed-off-by: Max Kellermann <max@duempel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/media-devnode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 6c56aebd8db0..86c7c3732c84 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -282,8 +282,11 @@ int __must_check media_devnode_register(struct media_devnode *mdev,
return 0;
error:
+ mutex_lock(&media_devnode_lock);
cdev_del(&mdev->cdev);
clear_bit(mdev->minor, media_devnode_nums);
+ mutex_unlock(&media_devnode_lock);
+
return ret;
}