lkml.org 
[lkml]   [2021]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] clk: fix leak on devm_clk_bulk_get_all() unwind
    Date
    clk_bulk_get_all() allocates an array of struct clk_bulk data for us
    (unlike clk_bulk_get()), so we need to free it. Let's use the
    clk_bulk_put_all() helper.

    kmemleak complains, on an RK3399 Gru/Kevin system:

    unreferenced object 0xffffff80045def00 (size 128):
    comm "swapper/0", pid 1, jiffies 4294667682 (age 86.394s)
    hex dump (first 32 bytes):
    44 32 60 fe fe ff ff ff 00 00 00 00 00 00 00 00 D2`.............
    48 32 60 fe fe ff ff ff 00 00 00 00 00 00 00 00 H2`.............
    backtrace:
    [<00000000742860d6>] __kmalloc+0x22c/0x39c
    [<00000000b0493f2c>] clk_bulk_get_all+0x64/0x188
    [<00000000325f5900>] devm_clk_bulk_get_all+0x58/0xa8
    [<00000000175b9bc5>] dwc3_probe+0x8ac/0xb5c
    [<000000009169e2f9>] platform_drv_probe+0x9c/0xbc
    [<000000005c51e2ee>] really_probe+0x13c/0x378
    [<00000000c47b1f24>] driver_probe_device+0x84/0xc0
    [<00000000f870fcfb>] __device_attach_driver+0x94/0xb0
    [<000000004d1b92ae>] bus_for_each_drv+0x8c/0xd8
    [<00000000481d60c3>] __device_attach+0xc4/0x150
    [<00000000a163bd36>] device_initial_probe+0x1c/0x28
    [<00000000accb6bad>] bus_probe_device+0x3c/0x9c
    [<000000001a199f89>] device_add+0x218/0x3cc
    [<000000001bd84952>] of_device_add+0x40/0x50
    [<000000009c658c29>] of_platform_device_create_pdata+0xac/0x100
    [<0000000021c69ba4>] of_platform_bus_create+0x190/0x224

    Fixes: f08c2e2865f6 ("clk: add managed version of clk_bulk_get_all")
    Cc: Dong Aisheng <aisheng.dong@nxp.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Brian Norris <briannorris@chromium.org>
    ---
    Never mind that kmemleak appears broken on 5.14-rc3+... but I caught the
    leak on an earlier kernel.

    drivers/clk/clk-devres.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c
    index be160764911b..f9d5b7334341 100644
    --- a/drivers/clk/clk-devres.c
    +++ b/drivers/clk/clk-devres.c
    @@ -92,13 +92,20 @@ int __must_check devm_clk_bulk_get_optional(struct device *dev, int num_clks,
    }
    EXPORT_SYMBOL_GPL(devm_clk_bulk_get_optional);

    +static void devm_clk_bulk_release_all(struct device *dev, void *res)
    +{
    + struct clk_bulk_devres *devres = res;
    +
    + clk_bulk_put_all(devres->num_clks, devres->clks);
    +}
    +
    int __must_check devm_clk_bulk_get_all(struct device *dev,
    struct clk_bulk_data **clks)
    {
    struct clk_bulk_devres *devres;
    int ret;

    - devres = devres_alloc(devm_clk_bulk_release,
    + devres = devres_alloc(devm_clk_bulk_release_all,
    sizeof(*devres), GFP_KERNEL);
    if (!devres)
    return -ENOMEM;
    --
    2.32.0.554.ge1b32706d8-goog
    \
     
     \ /
      Last update: 2021-07-31 05:02    [W:4.352 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site