From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC72BC55178 for ; Tue, 27 Oct 2020 17:33:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6459D20878 for ; Tue, 27 Oct 2020 17:33:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819981; bh=5ITvGLh7cmNRzaQQCfWDbV+p582wr5qCJGYBgVrmkDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ts/jzwvWATHvY2sZNdEToCpmRriMGVxxG+ngTTn3SWu7x6nFoh2NvJXf5XV5hO//T PLuizKNq/Jj97cUaDAgq/LorPJFprQEXAOSiRsaI/z3hLNmFV6cN5pFZOZ7FqCJjHh dBT7KPL4baTKXytNrANkM3/NwmTF2jFOQ9JsmsYo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1820115AbgJ0RdA (ORCPT ); Tue, 27 Oct 2020 13:33:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:40442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762132AbgJ0OlG (ORCPT ); Tue, 27 Oct 2020 10:41:06 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 095A521D7B; Tue, 27 Oct 2020 14:41:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809665; bh=5ITvGLh7cmNRzaQQCfWDbV+p582wr5qCJGYBgVrmkDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bPyfLNLKSuW4NR1qjjdI8ADC5fuEg3E7rk6+9+l6hDSoATmAHQxqBaij2CdE71Vgk XqGPkR2saUnCdn9YFGn9mIcufMRYg7UydWHQ7qa0kG3nIFiD22fADLO8nlS8p5lJfr kvUA2zIyHUpU7UVscYMcipTL6z3YzvZChx4C30Ro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 5.4 275/408] watchdog: Fix memleak in watchdog_cdev_register Date: Tue, 27 Oct 2020 14:53:33 +0100 Message-Id: <20201027135507.810582527@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ 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 Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20200824024001.25474-1-dinghao.liu@zju.edu.cn Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- 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 3729f99fd8eca..694357f2816b3 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -971,8 +971,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