shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

scsi: fcoe: Fix possible name leak when device_register() fails

Browse Source 
[ Upstream commit 47b6a122c7 ]

If device_register() returns an error, the name allocated by dev_set_name()
needs to be freed. As the comment of device_register() says, one should use
put_device() to give up the reference in the error path. Fix this by
calling put_device(), then the name can be freed in kobject_cleanup().

The 'fcf' is freed in fcoe_fcf_device_release(), so the kfree() in the
error path can be removed.

The 'ctlr' is freed in fcoe_ctlr_device_release(), so don't use the error
label, just return NULL after calling put_device().

Fixes: 9a74e884ee ("[SCSI] libfcoe: Add fcoe_sysfs")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221112094310.3633291-1-yangyingliang@huawei.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2022-11-12 17:43:10 +08:00
committed by Greg Kroah-Hartman
parent 2b142f6046
commit 9d0ad1e2ba
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/fcoe/fcoe_sysfs.c
View File

@@ -830,14 +830,15 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
dev_set_name(&ctlr->dev, "ctlr_%d", ctlr->id); dev_set_name(&ctlr->dev, "ctlr_%d", ctlr->id);
error = device_register(&ctlr->dev); error = device_register(&ctlr->dev);
if (error) if (error) {
goto out_del_q2; destroy_workqueue(ctlr->devloss_work_q);
destroy_workqueue(ctlr->work_q);
put_device(&ctlr->dev);
return NULL;
}
return ctlr; return ctlr;
out_del_q2:
destroy_workqueue(ctlr->devloss_work_q);
ctlr->devloss_work_q = NULL;
out_del_q: out_del_q:
destroy_workqueue(ctlr->work_q); destroy_workqueue(ctlr->work_q);
ctlr->work_q = NULL; ctlr->work_q = NULL;
@@ -1036,16 +1037,16 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
fcf->selected = new_fcf->selected; fcf->selected = new_fcf->selected;
error = device_register(&fcf->dev); error = device_register(&fcf->dev);
if (error) if (error) {
goto out_del; put_device(&fcf->dev);
goto out;
}
fcf->state = FCOE_FCF_STATE_CONNECTED; fcf->state = FCOE_FCF_STATE_CONNECTED;
list_add_tail(&fcf->peers, &ctlr->fcfs); list_add_tail(&fcf->peers, &ctlr->fcfs);
return fcf; return fcf;
out_del:
kfree(fcf);
out: out:
return NULL; return NULL;
} }