From: Luca Ceresoli <luca@lucaceresoli.net>
To: Colin King <colin.king@canonical.com>,
Marek Vasut <marek.vasut@gmail.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Adam Ford <aford173@gmail.com>,
linux-clk@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH][next] clk: vc5: fix use of memory after it has been kfree'd
Date: Tue, 21 Jul 2020 12:10:07 +0200 [thread overview]
Message-ID: <eb35ccc8-d3dc-a17c-a7b2-06475d310a4e@lucaceresoli.net> (raw)
In-Reply-To: <20200625132736.88832-1-colin.king@canonical.com>
Hi Colin,
On 25/06/20 15:27, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> There are a several places where printing an error message of
> init.name occurs after init.name has been kfree'd. Also the failure
> message is duplicated each time in the code. Fix this by adding
> a registration error failure path for these cases, moving the
> duplicated error messages to one common point and kfree'ing init.name
> only after it has been used.
>
> Changes also shrink the object code size by 171 bytes (x86-64, gcc 9.3):
>
> Before:
> text data bss dec hex filename
> 21057 3960 64 25081 61f9 drivers/clk/clk-versaclock5.o
>
> After:
> text data bss dec hex filename
> 20886 3960 64 24910 614e drivers/clk/clk-versaclock5.o
>
> Addresses-Coverity: ("Use after free")
> Fixes: f491276a5168 ("clk: vc5: Allow Versaclock driver to support multiple instances")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Woah, good catch!
> ---
> drivers/clk/clk-versaclock5.c | 51 +++++++++++++----------------------
> 1 file changed, 19 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/clk/clk-versaclock5.c b/drivers/clk/clk-versaclock5.c
> index 9a5fb3834b9a..1d8ee4b8b1f5 100644
> --- a/drivers/clk/clk-versaclock5.c
> +++ b/drivers/clk/clk-versaclock5.c
> @@ -882,11 +882,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
> init.parent_names = parent_names;
> vc5->clk_mux.init = &init;
> ret = devm_clk_hw_register(&client->dev, &vc5->clk_mux);
> + if (ret)
> + goto err_clk_register;
> kfree(init.name); /* clock framework made a copy of the name */
> - if (ret) {
> - dev_err(&client->dev, "unable to register %s\n", init.name);
> - goto err_clk;
> - }
>
> if (vc5->chip_info->flags & VC5_HAS_PFD_FREQ_DBL) {
> /* Register frequency doubler */
> @@ -900,12 +898,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
> init.num_parents = 1;
> vc5->clk_mul.init = &init;
> ret = devm_clk_hw_register(&client->dev, &vc5->clk_mul);
> + if (ret)
> + goto err_clk_register;
> kfree(init.name); /* clock framework made a copy of the name */
> - if (ret) {
> - dev_err(&client->dev, "unable to register %s\n",
> - init.name);
> - goto err_clk;
> - }
> }
>
> /* Register PFD */
> @@ -921,11 +916,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
> init.num_parents = 1;
> vc5->clk_pfd.init = &init;
> ret = devm_clk_hw_register(&client->dev, &vc5->clk_pfd);
> + if (ret)
> + goto err_clk_register;
> kfree(init.name); /* clock framework made a copy of the name */
> - if (ret) {
> - dev_err(&client->dev, "unable to register %s\n", init.name);
> - goto err_clk;
> - }
>
> /* Register PLL */
> memset(&init, 0, sizeof(init));
> @@ -939,11 +932,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
> vc5->clk_pll.vc5 = vc5;
> vc5->clk_pll.hw.init = &init;
> ret = devm_clk_hw_register(&client->dev, &vc5->clk_pll.hw);
> + if (ret)
> + goto err_clk_register;
> kfree(init.name); /* clock framework made a copy of the name */
> - if (ret) {
> - dev_err(&client->dev, "unable to register %s\n", init.name);
> - goto err_clk;
> - }
>
> /* Register FODs */
> for (n = 0; n < vc5->chip_info->clk_fod_cnt; n++) {
> @@ -960,12 +951,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
> vc5->clk_fod[n].vc5 = vc5;
> vc5->clk_fod[n].hw.init = &init;
> ret = devm_clk_hw_register(&client->dev, &vc5->clk_fod[n].hw);
> + if (ret)
> + goto err_clk_register;
> kfree(init.name); /* clock framework made a copy of the name */
> - if (ret) {
> - dev_err(&client->dev, "unable to register %s\n",
> - init.name);
> - goto err_clk;
> - }
> }
>
> /* Register MUX-connected OUT0_I2C_SELB output */
> @@ -981,11 +969,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
> vc5->clk_out[0].vc5 = vc5;
> vc5->clk_out[0].hw.init = &init;
> ret = devm_clk_hw_register(&client->dev, &vc5->clk_out[0].hw);
> - kfree(init.name); /* clock framework made a copy of the name */
> - if (ret) {
> - dev_err(&client->dev, "unable to register %s\n", init.name);
> - goto err_clk;
> - }
> + if (ret)
> + goto err_clk_register;
> + kfree(init.name); /* clock framework made a copy of the name */
>
> /* Register FOD-connected OUTx outputs */
> for (n = 1; n < vc5->chip_info->clk_out_cnt; n++) {
> @@ -1008,17 +994,15 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
> vc5->clk_out[n].vc5 = vc5;
> vc5->clk_out[n].hw.init = &init;
> ret = devm_clk_hw_register(&client->dev, &vc5->clk_out[n].hw);
> + if (ret)
> + goto err_clk_register;
> kfree(init.name); /* clock framework made a copy of the name */
> - if (ret) {
> - dev_err(&client->dev, "unable to register %s\n",
> - init.name);
> - goto err_clk;
> - }
>
> /* Fetch Clock Output configuration from DT (if specified) */
> ret = vc5_get_output_config(client, &vc5->clk_out[n]);
> if (ret)
> goto err_clk;
> +
> }
Stray newline. With it possibly fixed:
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
--
Luca
next prev parent reply other threads:[~2020-07-21 10:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 13:27 [PATCH][next] clk: vc5: fix use of memory after it has been kfree'd Colin King
2020-07-21 10:10 ` Luca Ceresoli [this message]
2020-07-23 1:46 ` Stephen Boyd
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=eb35ccc8-d3dc-a17c-a7b2-06475d310a4e@lucaceresoli.net \
--to=luca@lucaceresoli.net \
--cc=aford173@gmail.com \
--cc=colin.king@canonical.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marek.vasut@gmail.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;
as well as URLs for NNTP newsgroup(s).