aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2016-03-21 04:33:12 -0700
committerBen Hutchings <ben@decadent.org.uk>2020-04-28 19:03:49 +0100
commit7822acac3a2ca56bf519a9ac4e2d381454dc3b62 (patch)
treeb674e783dca19ac00ffc7cd908dedf8136e57904
parentd4f640d3c8e585f0accf523515daaa303108a951 (diff)
downloadlinux-stable-7822acac3a2ca56bf519a9ac4e2d381454dc3b62.tar.gz
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@decadent.org.uk>
-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 6c56aebd8db0f..86c7c3732c84d 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;
}