clk: zynqmp: Fix memory allocation in zynqmp_clk_setup
Subsystems (2)
PATCH 1/1 clk: zynqmp: Fix memory allocation in zynqmp_clk_setup
Fix memory allocation and use struct_size() in kzalloc().
--- drivers/clk/zynqmp/clkc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/zynqmp/clkc.c +2 -2
@@ -669,8 +669,8 @@ static int zynqmp_clk_setup(struct device_node *np)if (ret)return ret; - zynqmp_data =kzalloc (sizeof (*zynqmp_data) +sizeof (*zynqmp_data) * - clock_max_idx,GFP_KERNEL ); + zynqmp_data =kzalloc (struct_size (zynqmp_data, hws, clock_max_idx), +GFP_KERNEL );if (!zynqmp_data)return -ENOMEM ;
Signature · 1 line
2.17.0
Quoted 15 lines · Gustavo A. R. Silva
Fix memory allocation and use
struct_size()inkzalloc().Fixes 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/clk/zynqmp/clkc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/clk/zynqmp/clkc.c +0
-0
drivers/clk/zynqmp/clkc.c static int zynqmp_clk_setup(struct device_node *np) · line 676
Quoted 10 lines
drivers/clk/zynqmp/clkc.c +2
-2@@ -669,8 +669,8 @@ static int zynqmp_clk_setup(struct device_node *np)if (ret)return ret; - zynqmp_data =kzalloc (sizeof (*zynqmp_data) +sizeof (*zynqmp_data) * - clock_max_idx,GFP_KERNEL ); + zynqmp_data =kzalloc (struct_size (zynqmp_data, hws, clock_max_idx), +GFP_KERNEL );if (!zynqmp_data)return -ENOMEM ;
Looks good. Description could be maybe more verbose that you are fixing issue that it should be sizeof(struct clk_hw) instead of sizeof(struct clk_hw_onecell_data)
Otherwise
Thanks,
Michal
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoting Gustavo A. R. Silva (2018-12-23 21:50:58)
Quoted 6 lines
Fix memory allocation and use
struct_size()inkzalloc().Fixes 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")Signed-off-by Gustavo A. R. Silva <[email protected]>---
Applied to clk-fixes
And I added some words to commit text.