From: Gabriel Fernandez <gabriel.fernandez@st.com>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Mike Turquette <mturquette@linaro.org>
Cc: Pankaj Dev <pankaj.dev@st.com>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] clk: st: NULL dereference on error in st_of_clkgen_vcc_setup()
Date: Mon, 07 Apr 2014 13:06:04 +0000 [thread overview]
Message-ID: <5342A2BC.2020907@st.com> (raw)
In-Reply-To: <20140407063036.GA11581@mwanda>
Thanks Dan,
i m agree with patch.
Best Regards.
Gabriel
On 04/07/2014 08:30 AM, Dan Carpenter wrote:
> There are two allocations where, if they fail, then we end up
> dereferencing the NULL pointer in the error handling code.
>
> Fixes: 94885faf9dbc ('clk: st: Support for DIVMUX and PreDiv Clocks')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/clk/st/clkgen-mux.c b/drivers/clk/st/clkgen-mux.c
> index a329906..10899bc 100644
> --- a/drivers/clk/st/clkgen-mux.c
> +++ b/drivers/clk/st/clkgen-mux.c
> @@ -714,14 +714,14 @@ void __init st_of_clkgen_vcc_setup(struct device_node *np)
>
> clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
> if (!clk_data)
> - goto err;
> + goto err_free_parents;
>
> clk_data->clk_num = VCC_MAX_CHANNELS;
> clk_data->clks = kzalloc(clk_data->clk_num * sizeof(struct clk *),
> GFP_KERNEL);
>
> if (!clk_data->clks)
> - goto err;
> + goto err_free_data;
>
> for (i = 0; i < clk_data->clk_num; i++) {
> struct clk *clk;
> @@ -811,10 +811,11 @@ err:
> kfree(container_of(composite->mux_hw, struct clk_mux, hw));
> }
>
> - if (clk_data)
> - kfree(clk_data->clks);
> + kfree(clk_data->clks);
>
> +err_free_data:
> kfree(clk_data);
> +err_free_parents:
> kfree(parents);
> }
> CLK_OF_DECLARE(clkgen_vcc, "st,clkgen-vcc", st_of_clkgen_vcc_setup);
WARNING: multiple messages have this Message-ID (diff)
From: Gabriel Fernandez <gabriel.fernandez@st.com>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Mike Turquette <mturquette@linaro.org>
Cc: Pankaj Dev <pankaj.dev@st.com>, <linux-kernel@vger.kernel.org>,
<kernel-janitors@vger.kernel.org>
Subject: Re: [patch] clk: st: NULL dereference on error in st_of_clkgen_vcc_setup()
Date: Mon, 7 Apr 2014 15:06:04 +0200 [thread overview]
Message-ID: <5342A2BC.2020907@st.com> (raw)
In-Reply-To: <20140407063036.GA11581@mwanda>
Thanks Dan,
i m agree with patch.
Best Regards.
Gabriel
On 04/07/2014 08:30 AM, Dan Carpenter wrote:
> There are two allocations where, if they fail, then we end up
> dereferencing the NULL pointer in the error handling code.
>
> Fixes: 94885faf9dbc ('clk: st: Support for DIVMUX and PreDiv Clocks')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/clk/st/clkgen-mux.c b/drivers/clk/st/clkgen-mux.c
> index a329906..10899bc 100644
> --- a/drivers/clk/st/clkgen-mux.c
> +++ b/drivers/clk/st/clkgen-mux.c
> @@ -714,14 +714,14 @@ void __init st_of_clkgen_vcc_setup(struct device_node *np)
>
> clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
> if (!clk_data)
> - goto err;
> + goto err_free_parents;
>
> clk_data->clk_num = VCC_MAX_CHANNELS;
> clk_data->clks = kzalloc(clk_data->clk_num * sizeof(struct clk *),
> GFP_KERNEL);
>
> if (!clk_data->clks)
> - goto err;
> + goto err_free_data;
>
> for (i = 0; i < clk_data->clk_num; i++) {
> struct clk *clk;
> @@ -811,10 +811,11 @@ err:
> kfree(container_of(composite->mux_hw, struct clk_mux, hw));
> }
>
> - if (clk_data)
> - kfree(clk_data->clks);
> + kfree(clk_data->clks);
>
> +err_free_data:
> kfree(clk_data);
> +err_free_parents:
> kfree(parents);
> }
> CLK_OF_DECLARE(clkgen_vcc, "st,clkgen-vcc", st_of_clkgen_vcc_setup);
next prev parent reply other threads:[~2014-04-07 13:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-07 6:30 [patch] clk: st: NULL dereference on error in st_of_clkgen_vcc_setup() Dan Carpenter
2014-04-07 6:30 ` Dan Carpenter
2014-04-07 13:06 ` Gabriel Fernandez [this message]
2014-04-07 13:06 ` Gabriel Fernandez
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=5342A2BC.2020907@st.com \
--to=gabriel.fernandez@st.com \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=pankaj.dev@st.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.