| From 677ab4f9d477410d1a3216d4d51287d075c64195 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 21 Mar 2016 04:33:12 -0700 |
| Subject: media-devnode: add missing mutex lock in error handler |
| |
| From: Max Kellermann <max@duempel.org> |
| |
| 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> |
| --- |
| drivers/media/media-devnode.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| 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; |
| } |
| |
| -- |
| 2.25.1 |
| |
