[PATCH] clk: sifive: allocate sufficient memory for struct __prci_data

Palmer Dabbelt palmer at dabbelt.com
Thu Jun 25 18:13:39 EDT 2020


On Mon, 22 Jun 2020 18:24:17 PDT (-0700), vincent.chen at sifive.com wrote:
> The (struct __prci_data).hw_clks.hws is an array with dynamic elements.
> Using struct_size(pd, hw_clks.hws, ARRAY_SIZE(__prci_init_clocks))
> instead of sizeof(*pd) to get the correct memory size of
> struct __prci_data for sifive/fu540-prci. After applying this
> modifications, the kernel runs smoothly with CONFIG_SLAB_FREELIST_RANDOM
> enabled on the HiFive unleashed board.
>
> Fixes: 30b8e27e3b58 ("clk: sifive: add a driver for the SiFive FU540 PRCI IP block")
> Cc: stable at vger.kernel.org
> Signed-off-by: Vincent Chen <vincent.chen at sifive.com>
> ---
>  drivers/clk/sifive/fu540-prci.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
> index 6282ee2f361c..a8901f90a61a 100644
> --- a/drivers/clk/sifive/fu540-prci.c
> +++ b/drivers/clk/sifive/fu540-prci.c
> @@ -586,7 +586,10 @@ static int sifive_fu540_prci_probe(struct platform_device *pdev)
>  	struct __prci_data *pd;
>  	int r;
>
> -	pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);
> +	pd = devm_kzalloc(dev,
> +			  struct_size(pd, hw_clks.hws,
> +				      ARRAY_SIZE(__prci_init_clocks)),
> +			  GFP_KERNEL);
>  	if (!pd)
>  		return -ENOMEM;

This is on fixes, thanks!



More information about the linux-riscv mailing list