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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 8B429C433E0 for ; Wed, 23 Dec 2020 02:24:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 488FD221E5 for ; Wed, 23 Dec 2020 02:24:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 488FD221E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3dEkpQI+0yZaFGyza+ypmC/dZ/fWR+1iVGUSvV0eNJs=; b=oVt5F2yVTRtHG303XcqhH6HPv P9LJwFTNsjfnmz3qGYmZF1d8qtA3cqRR7F8seORULbR+O4jaCxI2g5n5TkRSNpVt/SbXFE312Wb5V 4oH8jwO5tyMZciCRG8ktrtmIlJzUOluM3yQshEAgwiz0k1C3WyMQjVkOHU6W2tW96XdAWxBYDeBqW NJQzxWj4b3tVtmIGBa4mdyLGvG9SCD81vYjVLvecsJFt0MvF/TnniviNdg5/XsBCacF4hq6dHEEVh YqhfgBuKX9oOJgHIawoFFGw9zW4ZEiPJCJMPInyxVMs9qGGrssPZFD93DhTHX4gJAGSeSfZDzjPzs rMuOMke0g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krtmy-0001In-1F; Wed, 23 Dec 2020 02:22:08 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1krtmd-0001CP-AK for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 02:21:49 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8948E23340; Wed, 23 Dec 2020 02:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690104; bh=J17Ye1tVNmhTMAZKXijNIjI7waSIU7anezzCCWHNJIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zr9F/u4mMh2NjOhVgyAQ66hFfjiAEHBbyG2OQt3ybahFhvW3/8j0DOW6s4BpckIki 9GQdeNfA/hmwCHlpsuHezQ2P+JrQ8vT9Bl2wi8rJkMyFxIG8iiRHBI0wcJQKeNdWbc Ecw36VLo/pKX5wGHrsepKi11fOCTFDPn9cAMm9gohWqpHtuL+YWME6Phy5s31e1X5v 6WFjgjvd/zWZVP7yTEGrWv9aIE8BZ8jYvlQpVxdYuHG9cM/CrxKqIwmTVYytUHL47w 0AQq+aCYpRgxCBDrTxcfuYtjrKudtGphdHt83+gTgLkG2PVPSph8J/M5D890beuvGC 2MSPLELO12MjA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 33/87] ARM: OMAP2+: Fix memleak in omap2xxx_clkt_vps_init Date: Tue, 22 Dec 2020 21:20:09 -0500 Message-Id: <20201223022103.2792705-33-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022103.2792705-1-sashal@kernel.org> References: <20201223022103.2792705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201222_212147_592111_5E09488C X-CRM114-Status: GOOD ( 10.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Lindgren , Sasha Levin , linux-omap@vger.kernel.org, Youling Tang , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Youling Tang [ Upstream commit 3c5902d270edb6ccc3049acfe5d3e96653c87dcd ] If the clk_register fails, we should free hw before function returns to prevent memleak. Signed-off-by: Youling Tang Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c index b64d717bfab6c..45fa2a87d5715 100644 --- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c +++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c @@ -247,6 +247,12 @@ void omap2xxx_clkt_vps_init(void) hw->hw.init = &init; clk = clk_register(NULL, &hw->hw); + if (IS_ERR(clk)) { + printk(KERN_ERR "Failed to register clock\n"); + kfree(hw); + return; + } + clkdev_create(clk, "cpufreq_ck", NULL); return; cleanup: -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel