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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB7B9C4332F for ; Mon, 6 Nov 2023 23:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233845AbjKFXUt (ORCPT ); Mon, 6 Nov 2023 18:20:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233874AbjKFXUf (ORCPT ); Mon, 6 Nov 2023 18:20:35 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C33A81985; Mon, 6 Nov 2023 15:17:31 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 701DCC32785; Mon, 6 Nov 2023 23:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699312651; bh=PZu2j41JmVNWupmmVeQTFZmFnIl0LxgGYcP6TDFQRV0=; h=From:To:Cc:Subject:Date:From; b=Z5CKYHb2nxpattVcXyMdb23JHlgHhJjaDOLB0pz5e1gv0CJywVThIZRLtNKIzhN29 nSFtL2cD3mn2YwHWH9haau1xNTWwNSC/9a/tzDEHIHXfyyJV1g1aOn/swzB1WFzWIh m5+5nLV3fu190GbRusT6Crk6odVvPnxDe4s39U3iJnrZey27NbION4WEXvqjGFSzUZ XByOy39Cnb8mYngooBMoR8LxscM0El8fSZdvmIbQ7N+Gh94aQmrbVVgvdUEfG+VxKG +VEcu3osWOzQfvNVcoQHATPRKbQXpujCoUzZPU3Awk8zYNMxeihB4chr43/YIp4adb z+uLaTjAC53ng== 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 4.14 1/4] clocksource/drivers/timer-imx-gpt: Fix potential memory leak Date: Mon, 6 Nov 2023 18:17:22 -0500 Message-ID: <20231106231728.3736117-1-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.328 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.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 6ec6d79b237ce..fcc12f72e907f 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -489,12 +489,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"); @@ -507,11 +511,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 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 A9DF6C4332F for ; Mon, 6 Nov 2023 23:17:57 +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: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:In-Reply-To:References: List-Owner; bh=fjyxZ4g1PIOTL3oiECI0uJ/8l3WCcI9Yafc84Bk543s=; b=1s8ZF0VnR9hnht YLlCXeDIkio0jzAJ97IEkaSbrJQOL+BPF5bRwpoDdi+xQzV/YaQi4TmxN8Ce7zIu0AaB6B776kkYW YitrsELHsmxyI5M9vFrjhmhohoRX6OWGBgpkOGnnKONbl7sc4/13zpMMy0bZa7iIhlWAKh5ZuUP/y vKsYhaqBC/fJz0reJjmQ4zB7+2Blqu4RRiE2qxzsH70FepHdAw9xQf21uokSsew+nP2JIlMdc29GZ O3eLMIBpkXzWdEHclXCjnFxkbF5f/MsBNiAzIDsfb3lZ6EX6azS2R3wMedvDOg4zDjqOK837vy4cS DWWfmRdO3foXmNpAd5SQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r08qd-0008Op-27; Mon, 06 Nov 2023 23:17:35 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r08qb-0008Nb-0z for linux-arm-kernel@lists.infradead.org; Mon, 06 Nov 2023 23:17:34 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 003CFB811EF; Mon, 6 Nov 2023 23:17:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 701DCC32785; Mon, 6 Nov 2023 23:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699312651; bh=PZu2j41JmVNWupmmVeQTFZmFnIl0LxgGYcP6TDFQRV0=; h=From:To:Cc:Subject:Date:From; b=Z5CKYHb2nxpattVcXyMdb23JHlgHhJjaDOLB0pz5e1gv0CJywVThIZRLtNKIzhN29 nSFtL2cD3mn2YwHWH9haau1xNTWwNSC/9a/tzDEHIHXfyyJV1g1aOn/swzB1WFzWIh m5+5nLV3fu190GbRusT6Crk6odVvPnxDe4s39U3iJnrZey27NbION4WEXvqjGFSzUZ XByOy39Cnb8mYngooBMoR8LxscM0El8fSZdvmIbQ7N+Gh94aQmrbVVgvdUEfG+VxKG +VEcu3osWOzQfvNVcoQHATPRKbQXpujCoUzZPU3Awk8zYNMxeihB4chr43/YIp4adb z+uLaTjAC53ng== 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 4.14 1/4] clocksource/drivers/timer-imx-gpt: Fix potential memory leak Date: Mon, 6 Nov 2023 18:17:22 -0500 Message-ID: <20231106231728.3736117-1-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.328 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231106_151733_484973_335254C8 X-CRM114-Status: GOOD ( 11.43 ) 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 6ec6d79b237ce..fcc12f72e907f 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -489,12 +489,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"); @@ -507,11 +511,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