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=ham 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 024D7C9DD5F for ; Tue, 27 Oct 2020 15:44:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF41C2242E for ; Tue, 27 Oct 2020 15:43:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813439; bh=EKMWqLGBnLiY7sqt7IKcLRfn/DcBW76AQ/2iXxwXAhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yAHxgAUPCkcO4XrQh1obYDGKMSPAvYRQU/G9BiuJtq5wMGtE+wn4U43Oamr6fgbVm 3bNUAh46PZapjkmf2OrOyX1e1N8DR+tYpquSLmCstHqm/4oKQqjsA9Nq6C20aNAOuw 0IEDsl26ZbX951M2ssHon38Wq6cgxzUPPFo8RfCY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1795188AbgJ0PPI (ORCPT ); Tue, 27 Oct 2020 11:15:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:45832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1794150AbgJ0PKL (ORCPT ); Tue, 27 Oct 2020 11:10:11 -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 C7DD320657; Tue, 27 Oct 2020 15:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811411; bh=EKMWqLGBnLiY7sqt7IKcLRfn/DcBW76AQ/2iXxwXAhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ssUrVTXoBtBGi58fN+Swhyc8fq0q+WGOb5MiijLU667VEHT7tBx5zY++tSTLAWyng XGhRpXdK11y4EkG42LNcN4wkc04sCJ8h1/k6dabPHes9gGkaH6WtKprZl42O/mEnc/ JAr4+H4RACGmjsyL8yJdrLaIVyjnYexSBpz6I554= 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.8 453/633] watchdog: Fix memleak in watchdog_cdev_register Date: Tue, 27 Oct 2020 14:53:16 +0100 Message-Id: <20201027135543.969296720@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@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 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