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=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 94D0BC4321A for ; Wed, 23 Dec 2020 03:02:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7592C206F6 for ; Wed, 23 Dec 2020 03:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731669AbgLWDCF (ORCPT ); Tue, 22 Dec 2020 22:02:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:45396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728729AbgLWCTm (ORCPT ); Tue, 22 Dec 2020 21:19:42 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D844F229CA; Wed, 23 Dec 2020 02:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689954; bh=Ny0nvANgIhhU6bTHscWWumHSI7lRAkDxmM5KCedXLDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Au4Wku9gEgHzhswKaaM2klLl0I7Azuga3aQgGNR6DOPEOJ9QgE3yvJg8YUvYwbWEY 79k9p4c0+Ar3+YTu3QsY7Ptpxn1dco6BjQC/b82rg1dtKv3+6smW5MScZZL1AKk1mC 4gnC7PjNN8JPw1+6C5/EpOV+RK0dfg4ZgK+WEVMHBfZqIik0VkpEQ05dJx6oIBJaRd 8ObpErOz/IA0Q5WzAlojCfnAWwExcis3+R1Jks7zZqfDM1QtseQyb/uNxOcRo+bwKc 9Rg7B8KZZYDRJynVbYOPeeNgyq+hgC2oqshOvJygWMl0adWRT6tdKtGzFAFOSHZ2r/ PsVjKM8VaECBA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Youling Tang , Tony Lindgren , Sasha Levin , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 047/130] ARM: OMAP2+: Fix memleak in omap2xxx_clkt_vps_init Date: Tue, 22 Dec 2020 21:16:50 -0500 Message-Id: <20201223021813.2791612-47-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-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 2a3e72286d3ab..70892b3da28d3 100644 --- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c +++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c @@ -244,6 +244,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 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=-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 BE7D7C433E0 for ; Wed, 23 Dec 2020 02:20:59 +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 7A0BD2222D for ; Wed, 23 Dec 2020 02:20:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A0BD2222D 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=Lmzh8aEXV9Dh6Mn4nsmkmpfu6kD0MEGNoA5Nw7TLThs=; b=o/vRJpQzpsRwk0nsb4bS+qTnG 5Fz9LorVyiAgVyw9UhybxLwD9LA9AldUwpjuyRUcY6ON1HI9i3cJSX2OKz0/3EE4jT9HMgPI+SDOL 1C5mGVoy094ukckN3rfwChriRuxHa1ZlNyqviESAMOPRz5jceQYZUSGtZy90DlAi6oLeUTWF6n5xl qnpL59EWevkkpHsb1apKQYzCp5YxxReCwcFYt+mif97NlpjsYvHDSxwlrgFv4hEXUkZlcnP7xV0S3 oBoEhLML1NJePCUe7UNdqQOFFO+VYFhEoFDsi1q47zIxAf0JNgv0RIE/4lddeQoZParZYgDUHth+8 thaRwOKRw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krtkM-0008EM-Tt; Wed, 23 Dec 2020 02:19:26 +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 1krtkB-00089x-93 for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 02:19:16 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D844F229CA; Wed, 23 Dec 2020 02:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689954; bh=Ny0nvANgIhhU6bTHscWWumHSI7lRAkDxmM5KCedXLDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Au4Wku9gEgHzhswKaaM2klLl0I7Azuga3aQgGNR6DOPEOJ9QgE3yvJg8YUvYwbWEY 79k9p4c0+Ar3+YTu3QsY7Ptpxn1dco6BjQC/b82rg1dtKv3+6smW5MScZZL1AKk1mC 4gnC7PjNN8JPw1+6C5/EpOV+RK0dfg4ZgK+WEVMHBfZqIik0VkpEQ05dJx6oIBJaRd 8ObpErOz/IA0Q5WzAlojCfnAWwExcis3+R1Jks7zZqfDM1QtseQyb/uNxOcRo+bwKc 9Rg7B8KZZYDRJynVbYOPeeNgyq+hgC2oqshOvJygWMl0adWRT6tdKtGzFAFOSHZ2r/ PsVjKM8VaECBA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 047/130] ARM: OMAP2+: Fix memleak in omap2xxx_clkt_vps_init Date: Tue, 22 Dec 2020 21:16:50 -0500 Message-Id: <20201223021813.2791612-47-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-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_211915_429194_AEB6A8CF X-CRM114-Status: GOOD ( 10.24 ) 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 2a3e72286d3ab..70892b3da28d3 100644 --- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c +++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c @@ -244,6 +244,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