OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scsi: sr: Fix sr_probe() missing deallocate of device minor 

[ Upstream commit 6555781b3f ]

If the cdrom fails to be registered then the device minor should be
deallocated.

Link: https://lore.kernel.org/r/072dac4b-8402-4de8-36bd-47e7588969cd@0882a8b5-c6c3-11e9-b005-00805fc181fe
Signed-off-by: Simon Arlott <simon@octiron.net>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Simon Arlott 2020-05-30 18:59:44 +01:00 committed by Greg Kroah-Hartman
parent 8f73ac0b64
commit 08d2ea2e23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/sr.c
View File

@ -750,7 +750,7 @@ static int sr_probe(struct device *dev)
cd->cdi.disk = disk; cd->cdi.disk = disk;
if (register_cdrom(&cd->cdi)) if (register_cdrom(&cd->cdi))
goto fail_put; goto fail_minor;
/* /*
* Initialize block layer runtime PM stuffs before the * Initialize block layer runtime PM stuffs before the
@ -768,6 +768,10 @@ static int sr_probe(struct device *dev)
return 0; return 0;
fail_minor:
spin_lock(&sr_index_lock);
clear_bit(minor, sr_index_bits);
spin_unlock(&sr_index_lock);
fail_put: fail_put:
put_disk(disk); put_disk(disk);
fail_free: fail_free: