2020-05-30 09:44:39

by Simon Arlott

Subject: [PATCH 2/2] scsi: sr: Fix sr_probe() missing deallocate of device minor

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

Signed-off-by: Simon Arlott <[email protected]>
---
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

2020-05-30 16:28:12

by Bart Van Assche

Subject: Re: [PATCH 2/2] scsi: sr: Fix sr_probe() missing deallocate of device minor

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.

Thanks,

Bart.