From: Viresh Kumar <viresh.kumar@linaro.org>
To: Fabien Parent <fabien.parent@linaro.org>
Cc: ilia.lin@kernel.org, agross@kernel.org,
bjorn.andersson@linaro.org, rafael@kernel.org,
linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] cpufreq: qcom: fix memory leak in error path
Date: Mon, 10 Oct 2022 11:25:30 +0530 [thread overview]
Message-ID: <20221010055530.2mf6lq4mn6zfdkzt@vireshk-i7> (raw)
In-Reply-To: <20221001171027.2101923-1-fabien.parent@linaro.org>
On 01-10-22, 19:10, Fabien Parent wrote:
> If for some reason the speedbin length is incorrect, then there is a
> memory leak in the error path because we never free the speedbin buffer.
> This commit fixes the error path to always free the speedbin buffer.
>
> Signed-off-by: Fabien Parent <fabien.parent@linaro.org>
> ---
> drivers/cpufreq/qcom-cpufreq-nvmem.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> index 863548f59c3e..3bd38acde4b9 100644
> --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
> +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> @@ -213,6 +213,7 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev,
> int speed = 0, pvs = 0, pvs_ver = 0;
> u8 *speedbin;
> size_t len;
> + int ret = 0;
>
> speedbin = nvmem_cell_read(speedbin_nvmem, &len);
>
> @@ -230,7 +231,8 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev,
> break;
> default:
> dev_err(cpu_dev, "Unable to read nvmem data. Defaulting to 0!\n");
> - return -ENODEV;
> + ret = -ENODEV;
> + goto len_error;
> }
>
> snprintf(*pvs_name, sizeof("speedXX-pvsXX-vXX"), "speed%d-pvs%d-v%d",
> @@ -238,8 +240,9 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev,
>
> drv->versions = (1 << speed);
>
> +len_error:
> kfree(speedbin);
> - return 0;
> + return ret;
> }
>
> static const struct qcom_cpufreq_match_data match_data_kryo = {
Applied. Thanks.
--
viresh
next prev parent reply other threads:[~2022-10-10 5:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-01 17:10 [PATCH 1/3] cpufreq: qcom: fix memory leak in error path Fabien Parent
2022-10-01 17:10 ` [PATCH 2/3] cpufreq: qcom: pass pvs_name size along with its buffer Fabien Parent
2022-10-10 5:52 ` Viresh Kumar
2022-10-10 6:01 ` Viresh Kumar
2022-10-01 17:10 ` [PATCH 3/3] cpufreq: qcom: fix writes in read-only memory region Fabien Parent
2022-10-10 6:00 ` Viresh Kumar
2022-10-10 5:55 ` Viresh Kumar [this message]
2022-10-10 6:02 ` [PATCH 1/3] cpufreq: qcom: fix memory leak in error path Viresh Kumar
2022-10-15 12:57 ` Fabien Parent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221010055530.2mf6lq4mn6zfdkzt@vireshk-i7 \
--to=viresh.kumar@linaro.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=fabien.parent@linaro.org \
--cc=ilia.lin@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).