clk: rs9: Fix and of_clk_hw_onecell_get() conversion
v4 cover clk: rs9: Fix and of_clk_hw_onecell_get() conversion
Hi all,
This patch series contains a fix and further development for the Renesas 9-series PCIe clock generator driver, which were submitted before as separate patches As the fix hasn't been picked up yet, and the further development depends on the fix, I am resending them as a series.
Thanks for your comments!
Geert Uytterhoeven (2):
clk: rs9: Add clock index range check to rs9_of_clk_get()
clk: rs9: Convert to clk_hw_onecell_data and of_clk_hw_onecell_get()
drivers/clk/clk-renesas-pcie.c | 39 ++++++++++++++++------------------ 1 file changed, 18 insertions(+), 21 deletions(-)
Signature · 12 lines
2.43.0
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsPATCH v4 1/2 clk: rs9: Add clock index range check to rs9_of_clk_get()
rs9_of_clk_get() does not validate the clock index in the passed DT clock specifier. If DT specifies an incorrect and out-of-range index, this will access memory beyond the end of the clk_dif[] array.
Fix by this adding a range check to rs9_of_clk_get().
---
v4:
- Put in a series,
v3:
- Add error message,
v2:
- Just add the missing range check; the conversion to of_clk_hw_onecell_get() can be done later.
v1: "[PATCH] clk: rs9: Convert to clk_hw_onecell_data and
of_clk_hw_onecell_get()"
https://lore.kernel.org/a6dce17b15d29a257d09fe0edc199a14c297f1a8.1768836042.git.geert+renesas@glider.be
---
drivers/clk/clk-renesas-pcie.c | 5 +++++
1 file changed, 5 insertions(+)drivers/clk/clk-renesas-pcie.c +5 -0
@@ -277,6 +277,11 @@ rs9_of_clk_get(struct of_phandle_args *clkspec, void *data)struct rs9_driver_data *rs9 = data;unsigned int idx = clkspec->args[0 ]; +if (idx >= rs9->chip_info->num_clks) { +pr_err ("%s: Invalid clock index %u\n" , __func__, idx); +return ERR_PTR (-EINVAL ); + } +return rs9->clk_dif[idx]; }
Signature · 1 line
2.43.0
Re: [PATCH v4 1/2] clk: rs9: Add clock index range check to rs9_of_clk_get()
Quoted 8 lines · Geert Uytterhoeven
rs9_of_clk_get()does not validate the clock index in the passed DT clock specifier. If DT specifies an incorrect and out-of-range index, this will access memory beyond the end of the clk_dif[] array.Fix by this adding a range check to
rs9_of_clk_get().Fixes 892e0ddea1aa6f70 ("clk: rs9: Add Renesas 9-series PCIe clock generator driver")Signed-off-by Geert Uytterhoeven <[email protected]>
PATCH v4 2/2 clk: rs9: Convert to clk_hw_onecell_data and of_clk_hw_onecell_get()
In reply to Geert UytterhoevenConvert the rs9 clock driver to use the of_clk_hw_onecell_get() helper, which requires using the clk_hw_onecell_data structure. Embedding that structure in the rs9_driver_data structure has the benefit that the clock array always has the correct size, and thus can no longer become out of sync when adding support for new rs9 variants.
---
v4:
- Add Reviewed-by,
- Rebase on top of "clk: rs9: Add clock index range check to rs9_of_clk_get()", so this becomes a pure refactoring instead of a fix,
- Put in a series,
(v3 and v2 do not exist)
--- drivers/clk/clk-renesas-pcie.c | 44 ++++++++++++++-------------------- 1 file changed, 18 insertions(+), 26 deletions(-)
drivers/clk/clk-renesas-pcie.c +18 -26
@@ -64,10 +64,11 @@ struct rs9_driver_data {struct i2c_client *client;struct regmap *regmap;const struct rs9_chip_info *chip_info; -struct clk_hw *clk_dif[8 ];u8 pll_amplitude;u8 pll_ssc;u8 clk_dif_sr; +/* must be last */ +struct clk_hw_onecell_data onecell; };/*
@@ -271,37 +272,28 @@ static void rs9_update_config(struct rs9_driver_data *rs9) } } -static struct clk_hw * -rs9_of_clk_get (struct of_phandle_args *clkspec,void *data) -{ -struct rs9_driver_data *rs9 = data; -unsigned int idx = clkspec->args[0 ]; - -if (idx >= rs9->chip_info->num_clks) { -pr_err ("%s: Invalid clock index %u\n" , __func__, idx); -return ERR_PTR (-EINVAL ); - } - -return rs9->clk_dif[idx]; -} -static int rs9_probe (struct i2c_client *client) { +const struct rs9_chip_info *chip_info;unsigned char name[5 ] ="DIF0" ;struct rs9_driver_data *rs9;unsigned int vid, did;struct clk_hw *hw;int i, ret; - rs9 =devm_kzalloc (&client->dev,sizeof (*rs9),GFP_KERNEL ); + chip_info =i2c_get_match_data (client); +if (!chip_info) +return -EINVAL ; + + rs9 =devm_kzalloc (&client->dev,struct_size (rs9, onecell.hws, + chip_info->num_clks),GFP_KERNEL );if (!rs9)return -ENOMEM ;i2c_set_clientdata (client, rs9); rs9->client = client; - rs9->chip_info =i2c_get_match_data (client); -if (!rs9->chip_info) -return -EINVAL ; + rs9->chip_info = chip_info; + rs9->onecell.num = chip_info->num_clks;/* Fetch common configuration from DT (if specified) */ ret =rs9_get_common_config (rs9);
@@ -309,7 +301,7 @@ static int rs9_probe(struct i2c_client *client)return ret;/* Fetch DIFx output configuration from DT (if specified) */ -for (i =0 ; i < rs9->chip_info->num_clks; i++) { +for (i =0 ; i < rs9->onecell.num; i++) { ret =rs9_get_output_config (rs9, i);if (ret)return ret;
@@ -335,24 +327,24 @@ static int rs9_probe(struct i2c_client *client)return ret; vid &=RS9_REG_VID_MASK ; -if (vid !=RS9_REG_VID_IDT || did != rs9->chip_info->did) +if (vid !=RS9_REG_VID_IDT || did != chip_info->did)return dev_err_probe (&client->dev, -ENODEV ,"Incorrect VID/DID: %#02x, %#02x. Expected %#02x, %#02x\n" , - vid, did,RS9_REG_VID_IDT , - rs9->chip_info->did); + vid, did,RS9_REG_VID_IDT , chip_info->did);/* Register clock */ -for (i =0 ; i < rs9->chip_info->num_clks; i++) { +for (i =0 ; i < rs9->onecell.num; i++) {snprintf (name,5 ,"DIF%d" , i); hw =devm_clk_hw_register_fixed_factor_index (&client->dev, name,0 ,0 ,4 ,1 );if (IS_ERR (hw))return PTR_ERR (hw); - rs9->clk_dif[i] = hw; + rs9->onecell.hws[i] = hw; } - ret =devm_of_clk_add_hw_provider (&client->dev, rs9_of_clk_get, rs9); + ret =devm_of_clk_add_hw_provider (&client->dev, of_clk_hw_onecell_get, + &rs9->onecell);if (!ret)rs9_update_config (rs9);
Signature · 1 line
2.43.0