| Message ID | 20210906090112.531442-1-ming.lei@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: sd: free 'scsi_disk' device via put_device | expand |
On 9/6/21 02:01, Ming Lei wrote: > Once the device is initialized via device_initialize(), it should be > freed via put_device, so fix it. Meantime get the parent before adding > device, the release handler can work as expected always. Since we are in the middle of the merge window this is probably not the best time to post patches. Anyway: Reviewed-by: Bart Van Assche <bvanassche@acm.org>
On Mon, 6 Sep 2021 17:01:12 +0800, Ming Lei wrote: > Once the device is initialized via device_initialize(), it should be > freed via put_device, so fix it. Meantime get the parent before adding > device, the release handler can work as expected always. > > Applied to 5.15/scsi-fixes, thanks! [1/1] scsi: sd: free 'scsi_disk' device via put_device https://git.kernel.org/mkp/scsi/c/265dfe8ebbab -- Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index cbd9999f93a6..a8039beb5a02 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3401,15 +3401,16 @@ static int sd_probe(struct device *dev) } device_initialize(&sdkp->dev); - sdkp->dev.parent = dev; + sdkp->dev.parent = get_device(dev); sdkp->dev.class = &sd_disk_class; dev_set_name(&sdkp->dev, "%s", dev_name(dev)); error = device_add(&sdkp->dev); - if (error) - goto out_free_index; + if (error) { + put_device(&sdkp->dev); + goto out; + } - get_device(dev); dev_set_drvdata(dev, sdkp); gd->major = sd_major((index & 0xf0) >> 4);
Once the device is initialized via device_initialize(), it should be freed via put_device, so fix it. Meantime get the parent before adding device, the release handler can work as expected always. Signed-off-by: Ming Lei <ming.lei@redhat.com> --- drivers/scsi/sd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)