From: duoming@zju.edu.cn
To: "Michal Simek" <michal.simek@amd.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
mturquette@baylibre.com, sboyd@kernel.org
Subject: Re: [PATCH v3] clk: zynq: Prevent null pointer dereference caused by kmalloc failure
Date: Fri, 1 Mar 2024 15:24:35 +0800 (GMT+08:00) [thread overview]
Message-ID: <74fd8b9e.6331.18df8e68c36.Coremail.duoming@zju.edu.cn> (raw)
In-Reply-To: <d9b6d49e-9485-4733-a2d6-615bcc8f6ef3@amd.com>
On Fri, 1 Mar 2024 08:05:17 +0100 Michal Simek wrote:
> > The kmalloc() in zynq_clk_setup() will return null if the
> > physical memory has run out. As a result, if we use snprintf()
> > to write data to the null address, the null pointer dereference
> > bug will happen.
> >
> > This patch uses a stack variable to replace the kmalloc().
> >
> > Fixes: 0ee52b157b8e ("clk: zynq: Add clock controller driver")
> > Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
> > ---
> > Changes in v3:
> > - Put stack variable in the head of the function and remove variable tmp.
> >
> > drivers/clk/zynq/clkc.c | 7 ++-----
> > 1 file changed, 2 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
> > index 7bdeaff2bfd..45479653c3b 100644
> > --- a/drivers/clk/zynq/clkc.c
> > +++ b/drivers/clk/zynq/clkc.c
> > @@ -215,7 +215,7 @@ static void __init zynq_clk_setup(struct device_node *np)
> > int i;
> > u32 tmp;
> > int ret;
> > - char *clk_name;
> > + char clk_name[16];
> > unsigned int fclk_enable = 0;
> > const char *clk_output_name[clk_max];
> > const char *cpu_parents[4];
> > @@ -426,12 +426,10 @@ static void __init zynq_clk_setup(struct device_node *np)
> > "gem1_emio_mux", CLK_SET_RATE_PARENT,
> > SLCR_GEM1_CLK_CTRL, 0, 0, &gem1clk_lock);
> >
> > - tmp = strlen("mio_clk_00x");
> > - clk_name = kmalloc(tmp, GFP_KERNEL);
> > for (i = 0; i < NUM_MIO_PINS; i++) {
> > int idx;
> >
> > - snprintf(clk_name, tmp, "mio_clk_%2.2d", i);
> > + snprintf(clk_name, 16, "mio_clk_%2.2d", i);
>
> I would prefer to use macro/define if that values has to match and have connection.
The origin code "clk_name = kmalloc(tmp, GFP_KERNEL)" allocates 16 bytes, so I set
the size of stack variable clk_name to 16 bytes.
Do you think if we use "#define CLK_NAME_LEN 16" is better?
Best regards,
Duoming Zhou
next prev parent reply other threads:[~2024-03-01 7:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 7:03 Duoming Zhou
2024-03-01 7:05 ` Michal Simek
2024-03-01 7:24 ` duoming [this message]
2024-03-01 7:30 ` Michal Simek
2024-03-01 7:54 ` duoming
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=74fd8b9e.6331.18df8e68c36.Coremail.duoming@zju.edu.cn \
--to=duoming@zju.edu.cn \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@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
all inboxes | Powered by JetHome®