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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E27E7C4332F for ; Mon, 6 Nov 2023 23:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y9SbgJNik2eyX9e4v9yK2Cy0czpxrpameKvEDqX3UAw=; b=qqF6Or3HuyMFP2 bkElI3YVPG70eAQVi9xvb1sfYdmTUYni8RKD1r2MJ6OLOO+gjPkLMZ9q8OWk2WIbOgRwmmldHjxEQ AsRdsUlmHQsiFNN8qKxq+ETCSgQ+Qm9sCSUV5MHCvf/x9d05bRiZbl5NHuZUF6h049MXFT4JrbRwc 7aC3J6yTTl2Wnmxn23qH1TnDDRFGYN2ocRefR3QaaDlSRzOXCszVc66E9yNktABq22biduN2LQe8o +tCMfLQkylMa8Qu9dxAVBfz1d8jMi5YqlwzCY4MNM9PzoM+sUX8p+s3Syta3KEQlt9kbE3/d+iOkj /0dUjaHw9fnPf2Xs+N+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r08pF-0007e9-2H; Mon, 06 Nov 2023 23:16:09 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r08pC-0007d2-0w for linux-arm-kernel@lists.infradead.org; Mon, 06 Nov 2023 23:16:07 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id BAD1FCE09B1; Mon, 6 Nov 2023 23:16:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1837CC433C8; Mon, 6 Nov 2023 23:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699312563; bh=0arbaNvnIAxlUW81YmPdpGIiJDwasLYkkL9kpZGsC8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qrc49tS4yBnBWPKAJws41lHsyFKv6xOrqTcvuAT5L3btYhxb+0Gyjgnpte8n7I8St Tt2KOw4bsSnOwGHQMWkRp7KYahj1yB8kqe+UM9lo706dWLozQ0TSlSBosh5J8RzMir GrHEi9L5UqJ0FX7/If7tr2D0CKW8jJxDh0DFoprPwp8DgIsX7ZEWxay8mk0KMW5Hxs DfjPDUa3sy3xlgZ1Km10kU5J2iDsrGjQmwOp89DbIKCEL1jvUPbJsoF29889pS/8SV aGK/0sQv/pLedqgHUV4pM3gbRuV2YGE9GzYMFKf0hL7LuZpGhWKbNK8uTvCOSdkMcH lexHL1uCFBb1w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jacky Bai , Peng Fan , Daniel Lezcano , Sasha Levin , tglx@linutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 05/11] clocksource/drivers/timer-imx-gpt: Fix potential memory leak Date: Mon, 6 Nov 2023 18:15:39 -0500 Message-ID: <20231106231553.3735366-5-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106231553.3735366-1-sashal@kernel.org> References: <20231106231553.3735366-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.61 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231106_151606_504590_D00F4732 X-CRM114-Status: GOOD ( 11.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: Jacky Bai [ Upstream commit 8051a993ce222a5158bccc6ac22ace9253dd71cb ] Fix coverity Issue CID 250382: Resource leak (RESOURCE_LEAK). Add kfree when error return. Signed-off-by: Jacky Bai Reviewed-by: Peng Fan Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20231009083922.1942971-1-ping.bai@nxp.com Signed-off-by: Sasha Levin --- drivers/clocksource/timer-imx-gpt.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 7b2c70f2f353b..fabff69e52e58 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -454,12 +454,16 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t return -ENOMEM; imxtm->base = of_iomap(np, 0); - if (!imxtm->base) - return -ENXIO; + if (!imxtm->base) { + ret = -ENXIO; + goto err_kfree; + } imxtm->irq = irq_of_parse_and_map(np, 0); - if (imxtm->irq <= 0) - return -EINVAL; + if (imxtm->irq <= 0) { + ret = -EINVAL; + goto err_kfree; + } imxtm->clk_ipg = of_clk_get_by_name(np, "ipg"); @@ -472,11 +476,15 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t ret = _mxc_timer_init(imxtm); if (ret) - return ret; + goto err_kfree; initialized = 1; return 0; + +err_kfree: + kfree(imxtm); + return ret; } static int __init imx1_timer_init_dt(struct device_node *np) -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel