Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5468576pxu; Tue, 22 Dec 2020 19:05:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtF7oLs36jML6yajatsTSHDIDdperXg6ShxfJUTawpUy/Cz00NIZRcdHa7vmXxTtQZtZe3 X-Received: by 2002:a17:906:8051:: with SMTP id x17mr21674242ejw.430.1608692703276; Tue, 22 Dec 2020 19:05:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608692703; cv=none; d=google.com; s=arc-20160816; b=t4ze0NgrP89kGKdY0tweiPkc4EPrJGITVpat3563AxqH8AwbWs5Sy+9y/aH7M+kITy QOIFqcP448R+pLvaXBmGi0ygc9rVXDyZh8YDaSLrPYG5u2O0JHM+NjCTh4Abpo5R0mXp 4Y7uucmY64euNRDj1QH3sa3AO5L/MQ/61UmVPSxuh5ayG8e8GSg9YRHzWgfCOVpZtzaP FkqmzzVCtjvRU3UTdEHUowHDn1nYCDZ7CzAdWjCSNRwF0Vsr/9iZgXTxPnebFYlYv5qT xbzHcYOvbYtSYWAxiVEF7SSZX4tOUnSTp8mWQAduVcbL1YSxEErmzhCkhzOSfuziIKen KFgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1D1115QeUAK3e0lx9a26wdEfHeujEIN2jM2yXN5BnkU=; b=FxYBd9R4CyrCRu6O76Z+Ka00nk1pvMYMLmHkpSHtb0+Sfm2TYaDLdkLzNTFoT32rXc ChZG9aSipW3z4l4xYqAo8mGYYQ3j8XL3/JrR/IUu6Ds3CUBCbSIkYRQQe2hfOltJKr8L 4ugCDO2qSde+wyfCAjlMRoj+3Z6I9iW8sJxobCDLrv4tuYvStixJJaXicTPnBA8GiVnN eFOipoLkRBSldwYSF1N6ydzA93yGuieT6QPk+87foyTnRTR7sIkNh2BREKlBecelBpYo RahXekgxwiLWms6N86OGqNTMMITWMUtYNbnBcou1EWxgSELSn3iPXcwMrY8KAyG8bCbI q+Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Au4Wku9g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f8si11209262ejc.50.2020.12.22.19.04.40; Tue, 22 Dec 2020 19:05:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Au4Wku9g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731661AbgLWDCE (ORCPT + 99 others); Tue, 22 Dec 2020 22:02:04 -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