]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
powercap: intel_rapl: Fix memory leak in rapl_add_package_cpuslocked()
authorSumeet Pawnikar <sumeet4linux@gmail.com>
Fri, 15 May 2026 18:26:16 +0000 (23:56 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 26 May 2026 13:00:42 +0000 (15:00 +0200)
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 <sumeet4linux@gmail.com>
Link: https://patch.msgid.link/20260515182616.227707-1-sumeet4linux@gmail.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/powercap/intel_rapl_common.c

index a8dd02dff0a093767762ec8826489ed5b50d9e36..f8afb4461e45f87d1626ac34015ce0ec0aed356c 100644 (file)
@@ -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)