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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 1779DC43603 for ; Wed, 23 Dec 2020 02:50:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E40C522D73 for ; Wed, 23 Dec 2020 02:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731180AbgLWCuF (ORCPT ); Tue, 22 Dec 2020 21:50:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:49898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729525AbgLWCV7 (ORCPT ); Tue, 22 Dec 2020 21:21:59 -0500 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 Cc: Youling Tang , Tony Lindgren , Sasha Levin , linux-arm-kernel@lists.infradead.org, linux-omap@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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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