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 E26E5C4332F for ; Mon, 6 Nov 2023 23:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233682AbjKFXTN (ORCPT ); Mon, 6 Nov 2023 18:19:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233779AbjKFXS3 (ORCPT ); Mon, 6 Nov 2023 18:18:29 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59DB22728; Mon, 6 Nov 2023 15:16:31 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F7AAC4167D; Mon, 6 Nov 2023 23:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699312587; bh=0arbaNvnIAxlUW81YmPdpGIiJDwasLYkkL9kpZGsC8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vJhO56iSJs+nLbiIxGYIx8ZKvsnpz/G6N+AQc73NhSlmI2gd0+Dbuhu7RELF/yee9 S6nmfcfETbWQdNCr4757DDX8CpFdvmyd4WFxqYruq4eUagvXzZbnWe6LfIiehrme/S XZmi+HV39UCMl93DfZU8mqCOa9g/qX1S+ZLIWOU1Y9rklRzpTM/xVV9pd4CrEetxyg uMg9OrosX5Kv3WdqjPoD/MhDjcpBCdk8ZKc9p+oaqPKI3w3d9YngLO3O0XUZwekHdZ MR3+UQtK6H3FQOFe0YgWmxGPeSzBJD+j95Wh2T/uqpf+G3KCPElTAZ1M7oMuvMy0m4 u3+UlP8UXdKXw== 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 5.15 2/6] clocksource/drivers/timer-imx-gpt: Fix potential memory leak Date: Mon, 6 Nov 2023 18:16:15 -0500 Message-ID: <20231106231622.3735613-2-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106231622.3735613-1-sashal@kernel.org> References: <20231106231622.3735613-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.137 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 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