diff options
| author | Simon Arlott <simon@octiron.net> | 2020-05-30 18:59:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-25 15:41:50 +0200 |
| commit | b69f3d2711c776ff82aa0b62613f7d0f2100512b (patch) | |
| tree | 4d88c4b4c5a9a5559a19d06d9914a33aae5d41e4 | |
| parent | 8906aa8e570562f289b8e42657121225f15f7453 (diff) | |
| download | linux-stable-b69f3d2711c776ff82aa0b62613f7d0f2100512b.tar.gz linux-stable-b69f3d2711c776ff82aa0b62613f7d0f2100512b.tar.bz2 linux-stable-b69f3d2711c776ff82aa0b62613f7d0f2100512b.zip | |
scsi: sr: Fix sr_probe() missing deallocate of device minor
[ 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>
| -rw-r--r-- | drivers/scsi/sr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index d0389b20574d..5be3d6b7991b 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -748,7 +748,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 @@ -766,6 +766,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: |