lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 453/633] watchdog: Fix memleak in watchdog_cdev_register
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 5afb6d203d0293512aa2c6ae098274a2a4f6ed02 ]

    When watchdog_kworker is NULL, we should free wd_data
    before the function returns to prevent memleak.

    Fixes: 664a39236e718 ("watchdog: Introduce hardware maximum heartbeat in watchdog core")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Link: https://lore.kernel.org/r/20200824024001.25474-1-dinghao.liu@zju.edu.cn
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/watchdog/watchdog_dev.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
    index b535f5fa279b9..d772dff789f3c 100644
    --- a/drivers/watchdog/watchdog_dev.c
    +++ b/drivers/watchdog/watchdog_dev.c
    @@ -991,8 +991,10 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
    wd_data->wdd = wdd;
    wdd->wd_data = wd_data;

    - if (IS_ERR_OR_NULL(watchdog_kworker))
    + if (IS_ERR_OR_NULL(watchdog_kworker)) {
    + kfree(wd_data);
    return -ENODEV;
    + }

    device_initialize(&wd_data->dev);
    wd_data->dev.devt = MKDEV(MAJOR(watchdog_devt), wdd->id);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:11    [W:2.738 / U:1.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site