[PATCH 4.4 084/149] cxl: Fix kobject memleak

From: Greg Kroah-Hartman
Date: Thu Aug 20 2020 - 06:31:51 EST


From: Wang Hai <wanghai38@xxxxxxxxxx>

[ Upstream commit 85c5cbeba8f4fb28e6b9bfb3e467718385f78f76 ]

Currently the error return path from kobject_init_and_add() is not
followed by a call to kobject_put() - which means we are leaking
the kobject.

Fix it by adding a call to kobject_put() in the error path of
kobject_init_and_add().

Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")
Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
Signed-off-by: Wang Hai <wanghai38@xxxxxxxxxx>
Acked-by: Andrew Donnellan <ajd@xxxxxxxxxxxxx>
Acked-by: Frederic Barrat <fbarrat@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20200602120733.5943-1-wanghai38@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
drivers/misc/cxl/sysfs.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

--- a/drivers/misc/cxl/sysfs.c
+++ b/drivers/misc/cxl/sysfs.c
@@ -539,7 +539,7 @@ static struct afu_config_record *cxl_sys
rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type,
&afu->dev.kobj, "cr%i", cr->cr);
if (rc)
- goto err;
+ goto err1;

rc = sysfs_create_bin_file(&cr->kobj, &cr->config_attr);
if (rc)
@@ -555,9 +555,6 @@ err2:
err1:
kobject_put(&cr->kobj);
return ERR_PTR(rc);
-err:
- kfree(cr);
- return ERR_PTR(rc);
}

void cxl_sysfs_afu_remove(struct cxl_afu *afu)