Skip to content

Commit 8cfc8ce

Browse files
ea1davisHans Verkuil
authored andcommitted
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: [email protected] Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=031d0cfd7c362817963f Tested-by: [email protected] Signed-off-by: Edward Adam Davis <[email protected]> Signed-off-by: Sakari Ailus <[email protected]> Signed-off-by: Hans Verkuil <[email protected]>
1 parent 895d3b4 commit 8cfc8ce

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/media/mc/mc-devnode.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,10 @@ void media_devnode_unregister(struct media_devnode *devnode)
276276
/* Delete the cdev on this minor as well */
277277
cdev_device_del(&devnode->cdev, &devnode->dev);
278278
devnode->media_dev = NULL;
279+
clear_bit(devnode->minor, media_devnode_nums);
279280
mutex_unlock(&media_devnode_lock);
280281

281282
put_device(&devnode->dev);
282-
283-
mutex_lock(&media_devnode_lock);
284-
clear_bit(devnode->minor, media_devnode_nums);
285-
mutex_unlock(&media_devnode_lock);
286283
}
287284

288285
/*

0 commit comments

Comments
 (0)