[PATCH] powercap: intel_rapl: Fix memory leak in rapl_add_package_cpuslocked()

[PATCH] powercap: intel_rapl: Fix memory leak in rapl_add_package_cpuslocked()

[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 <sumeet4linux@gmail.com>
---
 drivers/powercap/intel_rapl_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index a8dd02dff0a0..f8afb4461e45 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -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)
-- 
2.43.0

Re: [PATCH] powercap: intel_rapl: Fix memory leak in rapl_add_package_cpuslocked()

[Rafael J. Wysocki]

On Fri, May 15, 2026 at 8:26 PM Sumeet Pawnikar <sumeet4linux@gmail.com> wrote:
>
> 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>
> ---
>  drivers/powercap/intel_rapl_common.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index a8dd02dff0a0..f8afb4461e45 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -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!