From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: Daniel Golle <daniel@makrotopia.org>,
linux-pm@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rafael@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: Sam Shih <sam.shih@mediatek.com>, John Crispin <john@phrozen.org>
Subject: Re: [PATCH] cpufreq: mediatek: guard error paths to avoid kernel panic
Date: Thu, 23 Mar 2023 12:43:54 +0100 [thread overview]
Message-ID: <9e08ad33-ef86-6e49-2ef8-f697d2b82f04@collabora.com> (raw)
In-Reply-To: <ZBwyN7NwZ2zqHygr@makrotopia.org>
Il 23/03/23 12:04, Daniel Golle ha scritto:
> Guard pointer access in error path of mtk_cpu_dvfs_info_init() to
> make sure info->proc_reg and info->sram_reg are valid pointers before
> accessing them, which would result in kernel panic e.g. in case of
> them being set to -EPROBE_DEFER.
>
> Fixes: 4b9ceb757bbb ("cpufreq: mediatek: Enable clocks and regulators")
> Reported-by: Sam Shih <sam.shih@mediatek.com>
> Suggested-by: Sam Shih <sam.shih@mediatek.com>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> ---
> drivers/cpufreq/mediatek-cpufreq.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c
> index 4466d0c91a6a..980a31ddd0f2 100644
> --- a/drivers/cpufreq/mediatek-cpufreq.c
> +++ b/drivers/cpufreq/mediatek-cpufreq.c
> @@ -579,10 +579,12 @@ static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)
> dev_pm_opp_of_cpumask_remove_table(&info->cpus);
>
> out_free_resources:
> - if (regulator_is_enabled(info->proc_reg))
> - regulator_disable(info->proc_reg);
> - if (info->sram_reg && regulator_is_enabled(info->sram_reg))
> - regulator_disable(info->sram_reg);
> + if (!IS_ERR(info->proc_reg))
> + if (regulator_is_enabled(info->proc_reg))
> + regulator_disable(info->proc_reg);
> + if (!IS_ERR(info->sram_reg))
For both, actually, if you suspect that (xxxx)_reg may be NULL, then you should
use IS_ERR_OR_NULL() instead...
> + if (info->sram_reg && regulator_is_enabled(info->sram_reg))
...otherwise, here it's useless to check if it's not NULL?
Regards,
Angelo
prev parent reply other threads:[~2023-03-23 11:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 11:04 [PATCH] cpufreq: mediatek: guard error paths to avoid kernel panic Daniel Golle
2023-03-23 11:43 ` AngeloGioacchino Del Regno [this message]
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=9e08ad33-ef86-6e49-2ef8-f697d2b82f04@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=daniel@makrotopia.org \
--cc=john@phrozen.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=rafael@kernel.org \
--cc=sam.shih@mediatek.com \
--cc=viresh.kumar@linaro.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