[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAJZ5v0jvt6+Gzj==ht4y6O-Lx3Y9ZkiwFB18c48G-uVmyMs-YQ@mail.gmail.com>
Date: Mon, 15 Dec 2025 12:41:50 +0100
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Sumeet Pawnikar <sumeet4linux@...il.com>
Cc: linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org,
Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>
Subject: Re: [PATCH] powercap: fix memory leak in intel_rapl_common
On Sun, Dec 7, 2025 at 8:02 PM Sumeet Pawnikar <sumeet4linux@...il.com> wrote:
>
> The err_cleanup path in rapl_package_register_powercap() function
> doesn't free rp->domains before returning when child domain
> registration fails. Also, there is a missing the cleanup for the
> parent package power zone which was successfully registered earlier.
>
> When registration of child domains fails, now the previously
> registered package domain (parent zone) is being unregistered.
I'm not sure if this is desirable.
The package domain may be still functional without children AFAICS.
> This makes both parent and child powercap zones are properly
> unregistered before returning the error.
> Also, fix the rp->power_zone dangling pointer issue by setting it
> to NULL.
>
> Signed-off-by: Sumeet Pawnikar <sumeet4linux@...il.com>
> ---
> drivers/powercap/intel_rapl_common.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index b9d87e56cbbc..5ea31433abf2 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -1406,6 +1406,13 @@ static int rapl_package_register_powercap(struct rapl_package *rp)
> &rd->power_zone);
> }
>
> + /* Also unregister the package domain if it was registered */
> + if (rp->power_zone) {
> + powercap_unregister_zone(rp->priv->control_type,
> + rp->power_zone);
> + rp->power_zone = NULL;
> + }
> +
> return ret;
> }
>
> --
Powered by blists - more mailing lists