media: mc: Clear minor number before put device

The device minor should not be cleared after the device is released.

Fixes: 9e14868dc952 ("media: mc: Clear minor number reservation at unregistration time")
Cc: stable@vger.kernel.org
Reported-by: syzbot+031d0cfd7c362817963f@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=031d0cfd7c362817963f
Tested-by: syzbot+031d0cfd7c362817963f@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/mc/mc-devnode.c b/drivers/media/mc/mc-devnode.c
index 0d01cbae98f272fd77476a61d997c4bf6e674bb5..6daa7aa9944226551c301905b885e9d36cf793a3 100644 (file)
--- a/drivers/media/mc/mc-devnode.c
+++ b/drivers/media/mc/mc-devnode.c
@@ -276,13 +276,10 @@ void media_devnode_unregister(struct media_devnode *devnode)
        /* Delete the cdev on this minor as well */
        cdev_device_del(&devnode->cdev, &devnode->dev);
        devnode->media_dev = NULL;
+       clear_bit(devnode->minor, media_devnode_nums);
        mutex_unlock(&media_devnode_lock);
 
        put_device(&devnode->dev);
-
-       mutex_lock(&media_devnode_lock);
-       clear_bit(devnode->minor, media_devnode_nums);
-       mutex_unlock(&media_devnode_lock);
 }
 
 /*