If the cdrom fails to be registered then the device minor should be deallocated. Signed-off-by: Simon Arlott <simon@xxxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx --- On 30/05/2020 17:24, Bart Van Assche wrote: > On 2020-05-30 02:33, Simon Arlott wrote: >> If the cdrom fails to be registered then the device minor should be >> deallocated. > > Also for this patch, please add Fixes: and Cc: stable tags. I've Cc:'d stable. There is no specific previous commit that this fixes. I was just checking the rest of sr_probe when making a patch for the first issue. drivers/scsi/sr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 8d062d4f3ce0..1e13c6a0f0ca 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -797,7 +797,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 @@ -815,6 +815,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); -- 2.17.1 -- Simon Arlott
