]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media-devnode: add missing mutex lock in error handler
authorMax Kellermann <max@duempel.org>
Mon, 21 Mar 2016 11:33:12 +0000 (04:33 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 28 Apr 2020 18:03:49 +0000 (19:03 +0100)
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>
drivers/media/media-devnode.c

index 6c56aebd8db0ff488f4833364ce1d85737946c5c..86c7c3732c84df647096e1c225e9aa54aaf77826 100644 (file)
@@ -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;
 }