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

BugLink: https://bugs.launchpad.net/bugs/1885322
[ Upstream commit 6555781b3fdec5e94e6914511496144241df7dee ]

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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 4664fdf75c0f15acdc4c1f31251f7c30bcf47563..70a28f6fb1d0d3a3940a90648e7cb3e19db28d36 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -750,7 +750,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
@@ -768,6 +768,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);
 fail_free: