ACPI: mrrm: Fix memory leaks and improve error handling
PATCH v2 1/1 ACPI: mrrm: Fix memory leaks and improve error handling
Add proper error handling and resource cleanup to prevent memory leaks in add_boot_memory_ranges(). The function now checks for NULL return from kobject_create_and_add(), uses local buffer for range names to avoid dynamic allocation, and implements a cleanup path that removes previously created sysfs groups and kobjects on failure.
This prevents resource leaks when kobject creation or sysfs group creation fails during boot memory range initialization.
---
Changes in v2:
- Use local buffer for range names instead of kasprintf/kfree as suggested in review.
drivers/acpi/acpi_mrrm.c | 42 ++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)
drivers/acpi/acpi_mrrm.c +32 -10
@@ -149,26 +149,48 @@ ATTRIBUTE_GROUPS(memory_range);static __init int add_boot_memory_ranges (void ) { -struct kobject *pkobj, *kobj; +struct kobject *pkobj, *kobj, **kobjs;int ret = -EINVAL ; -char *name; +char name[16 ]; +int i; pkobj =kobject_create_and_add ("memory_ranges" , acpi_kobj); +if (!pkobj) +return -ENOMEM ; -for (int i =0 ; i < mrrm_mem_entry_num; i++) { - name =kasprintf (GFP_KERNEL ,"range%d" , i); -if (!name) { - ret = -ENOMEM ; -break ; - } + kobjs =kcalloc (mrrm_mem_entry_num,sizeof (*kobjs),GFP_KERNEL ); +if (!kobjs) { +kobject_put (pkobj); +return -ENOMEM ; + } +for (i =0 ; i < mrrm_mem_entry_num; i++) { +snprintf (name,sizeof (name),"range%d" , i); kobj =kobject_create_and_add (name, pkobj); +if (!kobj) { + ret = -ENOMEM ; + goto cleanup; + } ret =sysfs_create_groups (kobj, memory_range_groups); -if (ret) -return ret; +if (ret) { +kobject_put (kobj); + goto cleanup; + } + kobjs[i] = kobj; } +return 0 ; + +cleanup: +for (int j =0 ; j < i; j++) { +if (kobjs[j]) { +sysfs_remove_groups (kobjs[j], memory_range_groups); +kobject_put (kobjs[j]); + } + } +kfree (kobjs); +kobject_put (pkobj);return ret; }
Signature · 1 line
2.34.1
Quoted 57 lines · Kaushlendra Kumar
Add proper error handling and resource cleanup to prevent memory leaks in
add_boot_memory_ranges(). The function now checks for NULL return fromkobject_create_and_add(), uses local buffer for range names to avoid dynamic allocation, and implements a cleanup path that removes previously created sysfs groups and kobjects on failure.This prevents resource leaks when kobject creation or sysfs group creation fails during boot memory range initialization.
Signed-off-by Kaushlendra Kumar <[email protected]>---
Changes in v2:
- Use local buffer for range names instead of kasprintf/kfree as suggested in review.drivers/acpi/acpi_mrrm.c | 42 ++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)drivers/acpi/acpi_mrrm.c +16
-8@@ -149,26 +149,48 @@ ATTRIBUTE_GROUPS(memory_range);static __init int add_boot_memory_ranges (void ) { -struct kobject *pkobj, *kobj; +struct kobject *pkobj, *kobj, **kobjs;int ret = -EINVAL ; -char *name; +char name[16 ]; +int i; pkobj =kobject_create_and_add ("memory_ranges" , acpi_kobj); +if (!pkobj) +return -ENOMEM ; -for (int i =0 ; i < mrrm_mem_entry_num; i++) { - name =kasprintf (GFP_KERNEL ,"range%d" , i); -if (!name) { - ret = -ENOMEM ; -break ; - } + kobjs =kcalloc (mrrm_mem_entry_num,sizeof (*kobjs),GFP_KERNEL ); +if (!kobjs) { +kobject_put (pkobj); +return -ENOMEM ; + } +for (i =0 ; i < mrrm_mem_entry_num; i++) { +snprintf (name,sizeof (name),"range%d" , i); kobj =kobject_create_and_add (name, pkobj); +if (!kobj) { + ret = -ENOMEM ; + goto cleanup; + }
drivers/acpi/acpi_mrrm.c ATTRIBUTE_GROUPS(memory_range); · line 182
Quoted 10 lines
drivers/acpi/acpi_mrrm.c +5
-2ret =sysfs_create_groups (kobj, memory_range_groups); -if (ret) -return ret; +if (ret) { +kobject_put (kobj); + goto cleanup; + } + kobjs[i] = kobj; }
Need to
kfree(kobjs);
here.
Quoted 16 lines
drivers/acpi/acpi_mrrm.c +11
-0+return 0 ; + +cleanup: +for (int j =0 ; j < i; j++) { +if (kobjs[j]) { +sysfs_remove_groups (kobjs[j], memory_range_groups); +kobject_put (kobjs[j]); + } + } +kfree (kobjs); +kobject_put (pkobj);return ret; }Signature · 1 line
2.34.1
-Tony
Quoted 3 lines · Tony Luck
Need to
kfree(kobjs);here.
You're right! I missed freeing the kobjs array in the success path. I'll add the kfree(kobjs) before return 0 and send v3 patch.
Thanks for catching this!
Kaushlendra