public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drivers/media/media-devnode: add missing mutex lock in error handler
@ 2016-03-21 11:33 Max Kellermann
  2016-03-21 12:25 ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 4+ messages in thread
From: Max Kellermann @ 2016-03-21 11:33 UTC (permalink / raw)
  To: linux-kernel, linux-media


---
 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 cea35bf..4d7e8dd 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -266,8 +266,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;
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] drivers/media/media-devnode: add missing mutex lock in error handler
@ 2016-03-21 12:26 Max Kellermann
  0 siblings, 0 replies; 4+ messages in thread
From: Max Kellermann @ 2016-03-21 12:26 UTC (permalink / raw)
  To: linux-kernel, linux-media

Signed-off-by: Max Kellermann <max@duempel.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 cea35bf..4d7e8dd 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -266,8 +266,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;
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] drivers/media/media-devnode: add missing mutex lock in error handler
@ 2016-03-21 12:29 Max Kellermann
  0 siblings, 0 replies; 4+ messages in thread
From: Max Kellermann @ 2016-03-21 12:29 UTC (permalink / raw)
  To: linux-kernel, linux-media

All accesses to media_devnode_nums must be protected with
media_devnode_lock.  The error code path in media_devnode_register()
did not do this, however.

Signed-off-by: Max Kellermann <max@duempel.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 cea35bf..4d7e8dd 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -266,8 +266,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;
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-03-21 12:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-21 11:33 [PATCH] drivers/media/media-devnode: add missing mutex lock in error handler Max Kellermann
2016-03-21 12:25 ` Mauro Carvalho Chehab
  -- strict thread matches above, loose matches on Subject: below --
2016-03-21 12:26 Max Kellermann
2016-03-21 12:29 Max Kellermann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox