| Message ID | 20230802023521.208194-1-wangzhu9@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [-next,v2] SCSI: fix possible memory leak while device_add() fails | expand |
On 8/1/23 19:35, Zhu Wang wrote: > If device_add() returns error, the name allocated by dev_set_name() need > be freed. As comment of device_add() says, it should use put_device() to > decrease the reference count in the error path. So fix this by calling > put_device, then the name can be freed in kobject_cleanp(). > > Fixes: ee959b00c335 ("SCSI: convert struct class_device to struct device") > Signed-off-by: Zhu Wang <wangzhu9@huawei.com> > > --- > Changes in v2: > - Move the new put_device() call from under if to under err_out label. > --- > drivers/scsi/raid_class.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c > index 898a0bdf8df6..d9dd86a185f7 100644 > --- a/drivers/scsi/raid_class.c > +++ b/drivers/scsi/raid_class.c > @@ -249,6 +249,7 @@ int raid_component_add(struct raid_template *r,struct device *raid_dev, > > err_out: > list_del(&rc->node); > + put_device(&rc->dev); > rd->component_count--; > put_device(component_dev); > kfree(rc); Please perform the error recovery actions in the opposite order of the corresponding actions - this means swapping the list_del() and put_device() calls. Thanks, Bart.
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c index 898a0bdf8df6..d9dd86a185f7 100644 --- a/drivers/scsi/raid_class.c +++ b/drivers/scsi/raid_class.c @@ -249,6 +249,7 @@ int raid_component_add(struct raid_template *r,struct device *raid_dev, err_out: list_del(&rc->node); + put_device(&rc->dev); rd->component_count--; put_device(component_dev); kfree(rc);
If device_add() returns error, the name allocated by dev_set_name() need be freed. As comment of device_add() says, it should use put_device() to decrease the reference count in the error path. So fix this by calling put_device, then the name can be freed in kobject_cleanp(). Fixes: ee959b00c335 ("SCSI: convert struct class_device to struct device") Signed-off-by: Zhu Wang <wangzhu9@huawei.com> --- Changes in v2: - Move the new put_device() call from under if to under err_out label. --- drivers/scsi/raid_class.c | 1 + 1 file changed, 1 insertion(+)