Skip to contentSkip to conversation

cxl: Fix kobject memleak

PATCH In review Wang Hai 3 participants 5 messages Jun 2, 2020 – Jun 4, 2020 Char and misc drivers

lore
Share & tools
lore

Wang Hai

author
#0 lore raw

PATCH 1/1 cxl: Fix kobject memleak

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")
---
 drivers/misc/cxl/sysfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/cxl/sysfs.c +1 -1
index f0263d1..d97a243 100644
@@ -624,7 +624,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
 	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)
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw

Le 02/06/2020 à 14:07, Wang Hai a écrit :

Quoted 10 lines

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")

Indeed, a call to kobject_put() is needed when the init fails. Thanks!

Quoted 18 lines
---
  drivers/misc/cxl/sysfs.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/cxl/sysfs.c +1 -1
index f0263d1..d97a243 100644
@@ -624,7 +624,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
  	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)
#2 lore raw
In reply to Wang Hai
Quoted 10 lines · Wang Hai

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")

Thanks for the fix!

I note that the err1 label returns without calling kfree(cr) and I can't see a reason why we do that - so perhaps we should remove the return statement in err1: so it falls through?

Signature · 2 lines
Andrew Donnellan              OzLabs, ADL Canberra
[email protected]             IBM Australia Limited
#3 lore raw
Quoted 8 lines · Andrew Donnellan
Quoted 7 lines · Wang Hai

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().

Quoted 8 lines
Quoted 3 lines
Fixes b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")

Thanks for the fix!

I note that the err1 label returns without calling kfree(cr) and I can't see a reason why we do that - so perhaps we should remove the return statement in err1: so it falls through?

kfree(cr) can be called when kobject_put()-->kobject_release()-->kobject_cleanup()-->kobj_type->release() is called.  The kobj_type here is afu_config_record_type

Thanks,

Wang Hai

#4 lore raw
Quoted 1 line · wanghai (M)

kfree(cr) can be called when kobject_put()-->kobject_release()-->kobject_cleanup()-->kobj_type->release() is called.  The kobj_type here is afu_config_record_type

Of course, I missed that.

In that case

Thanks for the fix!

Signature · 2 lines
Andrew Donnellan              OzLabs, ADL Canberra
[email protected]             IBM Australia Limited