drivers/clk: convert VL struct to struct_size
Subsystems (7)
PATCH 1/1 drivers/clk: convert VL struct to struct_size
There are a few manually-calculated variable-length struct allocations left, this converts them to use struct_size.
--- drivers/clk/at91/sckc.c | 3 +-- drivers/clk/imgtec/clk-boston.c | 3 +-- drivers/clk/ingenic/tcu.c | 3 +-- drivers/clk/mvebu/ap-cpu-clk.c | 4 ++-- drivers/clk/mvebu/cp110-system-controller.c | 4 ++-- drivers/clk/samsung/clk.c | 3 +-- drivers/clk/uniphier/clk-uniphier-core.c | 3 +-- 7 files changed, 9 insertions(+), 14 deletions(-)
drivers/clk/at91/sckc.c +1 -2
@@ -478,8 +478,7 @@ static void __init of_sam9x60_sckc_setup(struct device_node *np)if (IS_ERR (slow_osc)) goto unregister_slow_rc; - clk_data =kzalloc (sizeof (*clk_data) + (2 *sizeof (struct clk_hw *)), -GFP_KERNEL ); + clk_data =kzalloc (struct_size (clk_data, hws,2 ),GFP_KERNEL );if (!clk_data) goto unregister_slow_osc;
drivers/clk/imgtec/clk-boston.c +1 -2
@@ -58,8 +58,7 @@ static void __init clk_boston_setup(struct device_node *np) cpu_div =ext_field (mmcmdiv,BOSTON_PLAT_MMCMDIV_CLK1DIV ); cpu_freq =mult_frac (in_freq, mul, cpu_div); - onecell =kzalloc (sizeof (*onecell) + - (BOSTON_CLK_COUNT *sizeof (struct clk_hw *)), + onecell =kzalloc (struct_size (onecell, hws,BOSTON_CLK_COUNT ),GFP_KERNEL );if (!onecell)return ;
drivers/clk/ingenic/tcu.c +1 -2
@@ -358,8 +358,7 @@ static int __init ingenic_tcu_probe(struct device_node *np) } } - tcu->clocks =kzalloc (sizeof (*tcu->clocks) + -sizeof (*tcu->clocks->hws) *TCU_CLK_COUNT , + tcu->clocks =kzalloc (struct_size (tcu->clocks, hws,TCU_CLK_COUNT ),GFP_KERNEL );if (!tcu->clocks) { ret = -ENOMEM ;
drivers/clk/mvebu/ap-cpu-clk.c +2 -2
@@ -274,8 +274,8 @@ static int ap_cpu_clock_probe(struct platform_device *pdev)if (!ap_cpu_clk)return -ENOMEM ; - ap_cpu_data =devm_kzalloc (dev,sizeof (*ap_cpu_data) + -sizeof (struct clk_hw *) * nclusters, + ap_cpu_data =devm_kzalloc (dev,struct_size (ap_cpu_data, hws, + nclusters),GFP_KERNEL );if (!ap_cpu_data)return -ENOMEM ;
drivers/clk/mvebu/cp110-system-controller.c +2 -2
@@ -235,8 +235,8 @@ static int cp110_syscon_common_probe(struct platform_device *pdev,if (ret)return ret; - cp110_clk_data =devm_kzalloc (dev,sizeof (*cp110_clk_data) + -sizeof (struct clk_hw *) *CP110_CLK_NUM , + cp110_clk_data =devm_kzalloc (dev,struct_size (cp110_clk_data, hws, +CP110_CLK_NUM ),GFP_KERNEL );if (!cp110_clk_data)return -ENOMEM ;
drivers/clk/samsung/clk.c +1 -2
@@ -60,8 +60,7 @@ struct samsung_clk_provider *__init samsung_clk_init(struct device_node *np,struct samsung_clk_provider *ctx;int i; - ctx =kzalloc (sizeof (struct samsung_clk_provider ) + -sizeof (*ctx->clk_data.hws) * nr_clks,GFP_KERNEL ); + ctx =kzalloc (struct_size (ctx, clk_data.hws, nr_clks),GFP_KERNEL );if (!ctx)panic ("could not allocate clock provider context.\n" );
drivers/clk/uniphier/clk-uniphier-core.c +1 -2
@@ -64,8 +64,7 @@ static int uniphier_clk_probe(struct platform_device *pdev)for (p = data; p->name; p++) clk_num =max (clk_num, p->idx +1 ); - hw_data =devm_kzalloc (dev, -sizeof (*hw_data) + clk_num *sizeof (struct clk_hw *), + hw_data =devm_kzalloc (dev,struct_size (hw_data, hws, clk_num),GFP_KERNEL );if (!hw_data)return -ENOMEM ;
Signature · 1 line
2.20.1
Quoted 3 lines · Stephen Kitt
There are a few manually-calculated variable-length struct allocations left, this converts them to use
struct_size.
How did you find this?
Please, mention the tool you used to find this in the commit log. With that you can add my
Thanks
--
Gustavo
Quoted 112 lines
Signed-off-by Stephen Kitt <[email protected]>--- drivers/clk/at91/sckc.c | 3 +-- drivers/clk/imgtec/clk-boston.c | 3 +-- drivers/clk/ingenic/tcu.c | 3 +-- drivers/clk/mvebu/ap-cpu-clk.c | 4 ++-- drivers/clk/mvebu/cp110-system-controller.c | 4 ++-- drivers/clk/samsung/clk.c | 3 +-- drivers/clk/uniphier/clk-uniphier-core.c | 3 +-- 7 files changed, 9 insertions(+), 14 deletions(-)drivers/clk/at91/sckc.c +1
-2@@ -478,8 +478,7 @@ static void __init of_sam9x60_sckc_setup(struct device_node *np)if (IS_ERR (slow_osc)) goto unregister_slow_rc; - clk_data =kzalloc (sizeof (*clk_data) + (2 *sizeof (struct clk_hw *)), -GFP_KERNEL ); + clk_data =kzalloc (struct_size (clk_data, hws,2 ),GFP_KERNEL );if (!clk_data) goto unregister_slow_osc;drivers/clk/imgtec/clk-boston.c +1
-2@@ -58,8 +58,7 @@ static void __init clk_boston_setup(struct device_node *np) cpu_div =ext_field (mmcmdiv,BOSTON_PLAT_MMCMDIV_CLK1DIV ); cpu_freq =mult_frac (in_freq, mul, cpu_div); - onecell =kzalloc (sizeof (*onecell) + - (BOSTON_CLK_COUNT *sizeof (struct clk_hw *)), + onecell =kzalloc (struct_size (onecell, hws,BOSTON_CLK_COUNT ),GFP_KERNEL );if (!onecell)return ;drivers/clk/ingenic/tcu.c +1
-2@@ -358,8 +358,7 @@ static int __init ingenic_tcu_probe(struct device_node *np) } } - tcu->clocks =kzalloc (sizeof (*tcu->clocks) + -sizeof (*tcu->clocks->hws) *TCU_CLK_COUNT , + tcu->clocks =kzalloc (struct_size (tcu->clocks, hws,TCU_CLK_COUNT ),GFP_KERNEL );if (!tcu->clocks) { ret = -ENOMEM ;drivers/clk/mvebu/ap-cpu-clk.c +2
-2@@ -274,8 +274,8 @@ static int ap_cpu_clock_probe(struct platform_device *pdev)if (!ap_cpu_clk)return -ENOMEM ; - ap_cpu_data =devm_kzalloc (dev,sizeof (*ap_cpu_data) + -sizeof (struct clk_hw *) * nclusters, + ap_cpu_data =devm_kzalloc (dev,struct_size (ap_cpu_data, hws, + nclusters),GFP_KERNEL );if (!ap_cpu_data)return -ENOMEM ;drivers/clk/mvebu/cp110-system-controller.c +2
-2@@ -235,8 +235,8 @@ static int cp110_syscon_common_probe(struct platform_device *pdev,if (ret)return ret; - cp110_clk_data =devm_kzalloc (dev,sizeof (*cp110_clk_data) + -sizeof (struct clk_hw *) *CP110_CLK_NUM , + cp110_clk_data =devm_kzalloc (dev,struct_size (cp110_clk_data, hws, +CP110_CLK_NUM ),GFP_KERNEL );if (!cp110_clk_data)return -ENOMEM ;drivers/clk/samsung/clk.c +1
-2@@ -60,8 +60,7 @@ struct samsung_clk_provider *__init samsung_clk_init(struct device_node *np,struct samsung_clk_provider *ctx;int i; - ctx =kzalloc (sizeof (struct samsung_clk_provider ) + -sizeof (*ctx->clk_data.hws) * nr_clks,GFP_KERNEL ); + ctx =kzalloc (struct_size (ctx, clk_data.hws, nr_clks),GFP_KERNEL );if (!ctx)panic ("could not allocate clock provider context.\n" );drivers/clk/uniphier/clk-uniphier-core.c +1
-2@@ -64,8 +64,7 @@ static int uniphier_clk_probe(struct platform_device *pdev)for (p = data; p->name; p++) clk_num =max (clk_num, p->idx +1 ); - hw_data =devm_kzalloc (dev, -sizeof (*hw_data) + clk_num *sizeof (struct clk_hw *), + hw_data =devm_kzalloc (dev,struct_size (hw_data, hws, clk_num),GFP_KERNEL );if (!hw_data)return -ENOMEM ;
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 5 lines · Stephen Boyd
Quoting Gustavo A. R. Silva (2019-10-02 12:20:28)
Quoted 4 lines · Stephen Kitt
Quoted 2 lines
There are a few manually-calculated variable-length struct allocations left, this converts them to use
struct_size.
Quoted 8 lines
Quoted 6 lines
How did you find this?
Please, mention the tool you used to find this in the commit log. With that you can add my
Any answer? I'm tempted to just apply the patch anyway.
Sorry, I hadn’t seen Gustavo’s email!
I didn’t use anything particularly fancy to find these, my history says
git grep -A1 'kzalloc.*sizeof[^_].*+'
and manual review. I noticed that clk/ had a number of hits, but also commits to switch to struct_size so I reckoned it was worth pursuing the exercise there.
Is it worth adding that to the commit message?
Regards,
Stephen
Quoting Stephen Kitt (2019-09-27 11:51:10)
Quoted 5 lines
There are a few manually-calculated variable-length struct allocations left, this converts them to use
struct_size.Signed-off-by Stephen Kitt <[email protected]>---
Applied to clk-next