drivers: base: transport_class: fix resource leak when transport_add_device() fails
[ Upstream commite5da06b27f
] The normal call sequence of using transport class is: Add path: transport_setup_device() transport_setup_classdev() // call sas_host_setup() here transport_add_device() // if fails, need call transport_destroy_device() transport_configure_device() Remove path: transport_remove_device() transport_remove_classdev // call sas_host_remove() here transport_destroy_device() If transport_add_device() fails, need call transport_destroy_device() to free memory, but in this case, ->remove() is not called, and the resources allocated in ->setup() are leaked. So fix these leaks by calling ->remove() in transport_add_class_device() if it returns error. Fixes:1da177e4c3
("Linux-2.6.12-rc2") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20221115031638.3816551-1-yangyingliang@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
e77745640f
commit
29274780dd
|
@ -155,12 +155,27 @@ static int transport_add_class_device(struct attribute_container *cont,
|
|||
struct device *dev,
|
||||
struct device *classdev)
|
||||
{
|
||||
struct transport_class *tclass = class_to_transport_class(cont->class);
|
||||
int error = attribute_container_add_class_device(classdev);
|
||||
struct transport_container *tcont =
|
||||
attribute_container_to_transport_container(cont);
|
||||
|
||||
if (!error && tcont->statistics)
|
||||
if (error)
|
||||
goto err_remove;
|
||||
|
||||
if (tcont->statistics) {
|
||||
error = sysfs_create_group(&classdev->kobj, tcont->statistics);
|
||||
if (error)
|
||||
goto err_del;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_del:
|
||||
attribute_container_class_device_del(classdev);
|
||||
err_remove:
|
||||
if (tclass->remove)
|
||||
tclass->remove(tcont, dev, classdev);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue