From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2180CC48BE5 for ; Wed, 23 Jun 2021 13:44:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 068D761076 for ; Wed, 23 Jun 2021 13:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230427AbhFWNrG (ORCPT ); Wed, 23 Jun 2021 09:47:06 -0400 Received: from foss.arm.com ([217.140.110.172]:35574 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230206AbhFWNrG (ORCPT ); Wed, 23 Jun 2021 09:47:06 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 840CEED1; Wed, 23 Jun 2021 06:44:48 -0700 (PDT) Received: from localhost (unknown [10.1.195.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 238D33F718; Wed, 23 Jun 2021 06:44:48 -0700 (PDT) Date: Wed, 23 Jun 2021 14:44:46 +0100 From: Ionela Voinescu To: Viresh Kumar Cc: Rafael Wysocki , linux-pm@vger.kernel.org, Vincent Guittot , Qian Cai , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Subject: Re: [PATCH V3 1/4] cpufreq: cppc: Fix potential memleak in cppc_cpufreq_cpu_init Message-ID: <20210623134446.GA12411@arm.com> References: <579689469ed8a7dfd68dcbb41e9191472799a326.1624266901.git.viresh.kumar@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <579689469ed8a7dfd68dcbb41e9191472799a326.1624266901.git.viresh.kumar@linaro.org> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Monday 21 Jun 2021 at 14:49:34 (+0530), Viresh Kumar wrote: > It's a classic example of memleak, we allocate something, we fail and > never free the resources. > > Make sure we free all resources on policy ->init() failures. > > Fixes: a28b2bfc099c ("cppc_cpufreq: replace per-cpu data array with a list") This is on me, thanks for the fix! Might be better for this to be separate from the series, but I suppose all will be going in 5.14 anyway. > Tested-by: Vincent Guittot > Signed-off-by: Viresh Kumar > --- > drivers/cpufreq/cppc_cpufreq.c | 30 ++++++++++++++++++++---------- > 1 file changed, 20 insertions(+), 10 deletions(-) > > diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c > index be4f62e2c5f1..35b8ae66d1fb 100644 > --- a/drivers/cpufreq/cppc_cpufreq.c > +++ b/drivers/cpufreq/cppc_cpufreq.c > @@ -256,6 +256,16 @@ static struct cppc_cpudata *cppc_cpufreq_get_cpu_data(unsigned int cpu) > return NULL; > } > > +static void cppc_cpufreq_put_cpu_data(struct cpufreq_policy *policy) > +{ > + struct cppc_cpudata *cpu_data = policy->driver_data; > + > + list_del(&cpu_data->node); > + free_cpumask_var(cpu_data->shared_cpu_map); > + kfree(cpu_data); > + policy->driver_data = NULL; > +} > + > static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) > { > unsigned int cpu = policy->cpu; > @@ -309,7 +319,8 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) > default: > pr_debug("Unsupported CPU co-ord type: %d\n", > policy->shared_type); > - return -EFAULT; > + ret = -EFAULT; > + goto out; > } > > /* > @@ -324,10 +335,14 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) > cpu_data->perf_ctrls.desired_perf = caps->highest_perf; > > ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls); > - if (ret) > - pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n", > - caps->highest_perf, cpu, ret); > + if (!ret) > + return 0; > > + pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n", > + caps->highest_perf, cpu, ret); > + Nit: I would have preferred the more traditional: if (ret) { pr_debug(); goto out; } return 0; It's always easier to read. Thanks, Ionela. > +out: > + cppc_cpufreq_put_cpu_data(policy); > return ret; > } > > @@ -345,12 +360,7 @@ static int cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy) > pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n", > caps->lowest_perf, cpu, ret); > > - /* Remove CPU node from list and free driver data for policy */ > - free_cpumask_var(cpu_data->shared_cpu_map); > - list_del(&cpu_data->node); > - kfree(policy->driver_data); > - policy->driver_data = NULL; > - > + cppc_cpufreq_put_cpu_data(policy); > return 0; > } > > -- > 2.31.1.272.g89b43f80a514 >