summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Arlott <simon@octiron.net>2020-05-30 18:59:44 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2020-06-09 21:57:26 -0400
commit6555781b3fdec5e94e6914511496144241df7dee (patch)
tree6c10da8f042249b76332642d862599d9efcd0990
parenta247e07f8dadba5da9f188aaf4f96db0302146d9 (diff)
scsi: sr: Fix sr_probe() missing deallocate of device minor
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>
-rw-r--r--drivers/scsi/sr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 59718903e1ef..b9cff27e2c81 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -793,7 +793,7 @@ static int sr_probe(struct device *dev)
cd->cdi.disk = disk;
if (register_cdrom(&cd->cdi))
- goto fail_put;
+ goto fail_minor;
/*
* Initialize block layer runtime PM stuffs before the
@@ -811,6 +811,10 @@ static int sr_probe(struct device *dev)
return 0;
+fail_minor:
+ spin_lock(&sr_index_lock);
+ clear_bit(minor, sr_index_bits);
+ spin_unlock(&sr_index_lock);
fail_put:
put_disk(disk);
mutex_destroy(&cd->lock);