lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 111/178] clk: sifive: allocate sufficient memory for struct __prci_data
    Date
    From: Vincent Chen <vincent.chen@sifive.com>

    [ Upstream commit d0a5fdf4cc83dabcdea668f971b8a2e916437711 ]

    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")
    Signed-off-by: Vincent Chen <vincent.chen@sifive.com>
    Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 6282ee2f361cd..a8901f90a61ac 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;

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:54    [W:4.079 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site