Skip to contentSkip to conversation

powercap: intel_rapl: Fix memory leak in rapl_add_package_cpuslocked()

PATCH Applied Sumeet Pawnikar 2 participants 2 messages May 15 – May 26 Power management core

lore
Share & tools
lore

Sumeet Pawnikar

author
#0 lore raw

PATCH 1/1 powercap: intel_rapl: Fix memory leak in rapl_add_package_cpuslocked()

When topology_physical_package_id()/topology_logical_die_id() returns a negative value, rapl_add_package_cpuslocked() returns ERR_PTR(-EINVAL) directly without freeing the rapl_package structure that was just allocated by kzalloc_obj(), leaking memory on every failed package addition.

Use the existing err_free_package label so that the allocation is released on the error path.

Signed-off-by Sumeet Pawnikar <[email protected]>
---
 drivers/powercap/intel_rapl_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/powercap/intel_rapl_common.c +2 -1
index a8dd02dff0a0..f8afb4461e45 100644
@@ -1770,7 +1770,8 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr
 			 topology_physical_package_id(id) : topology_logical_die_id(id);
 		if ((int)(rp->id) < 0) {
 			pr_err("topology_logical_(package/die)_id() returned a negative value");
-			return ERR_PTR(-EINVAL);
+			ret = -EINVAL;
+			goto err_free_package;
 		}
 		rp->lead_cpu = id;
 		if (!rapl_msrs_are_pkg_scope() && topology_max_dies_per_package() > 1)
Signature · 1 line
2.43.0
maintainer Applied
#1 lore raw
Quoted 20 lines · Sumeet Pawnikar

When topology_physical_package_id()/topology_logical_die_id() returns a negative value, rapl_add_package_cpuslocked() returns ERR_PTR(-EINVAL) directly without freeing the rapl_package structure that was just allocated by kzalloc_obj(), leaking memory on every failed package addition.

Use the existing err_free_package label so that the allocation is released on the error path.

Signed-off-by Sumeet Pawnikar <[email protected]>
---
 drivers/powercap/intel_rapl_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/powercap/intel_rapl_common.c +0 -0
index a8dd02dff0a0..f8afb4461e45 100644

drivers/powercap/intel_rapl_common.c struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr

Quoted 10 lines
drivers/powercap/intel_rapl_common.c +2 -2
@@ -1770,7 +1770,8 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr
                         topology_physical_package_id(id) : topology_logical_die_id(id);
                if ((int)(rp->id) < 0) {
                        pr_err("topology_logical_(package/die)_id() returned a negative value");
-                       return ERR_PTR(-EINVAL);
+                       ret = -EINVAL;
+                       goto err_free_package;
                }
                rp->lead_cpu = id;
                if (!rapl_msrs_are_pkg_scope() && topology_max_dies_per_package() > 1)
--

Applied as 7.2 material, thanks!