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 323DBC0018C for ; Mon, 6 Nov 2023 23:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233493AbjKFXOy (ORCPT ); Mon, 6 Nov 2023 18:14:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233477AbjKFXOw (ORCPT ); Mon, 6 Nov 2023 18:14:52 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66B9310CC; Mon, 6 Nov 2023 15:14:47 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 020DCC433CA; Mon, 6 Nov 2023 23:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699312487; bh=t0/mAlfAZXAna5kFgAV5hkD+KoVFFjK4IKREhDZ5t+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pkeaAhmIbGAk2/0bnZUCg8i2CQ5BCdOELoq22jXjlVkk/tEeQ/On+eBsJZtPWDxn3 KOrUk8lADLYceRYERhNuUjyfa3Jq7aXDv2fi4n4Z/aUksYhXipk3Mr15UOtzspEOPn 1esop7oI5MS0lwQKSLlpK+7kiWyefgckAPWj0FQa6IUbwbUu9EgU8lPK7JuMu6y5OD ZXQLbiKgs65tbWPzxkXWnFEG/G4UAdr8Fm1hj1g16FhMSflG664NEGTGffPyRbUXKZ +Hj6mPj6WD313UdU3kI4bCvTJQwKSH4dxDdDqZ4G+8bzumGLC7NpaW2kscykEarVqu hfwAzJFKI0+fA== 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.6 06/13] clocksource/drivers/timer-imx-gpt: Fix potential memory leak Date: Mon, 6 Nov 2023 18:14:19 -0500 Message-ID: <20231106231435.3734790-6-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106231435.3734790-1-sashal@kernel.org> References: <20231106231435.3734790-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 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 28ab4f1a7c713..6a878d227a13b 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -434,12 +434,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"); @@ -452,11 +456,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 B93A4C4332F for ; Mon, 6 Nov 2023 23:15:18 +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=juQdZOwD0a3jZWlQobl1deqKtaRfRb71GRK948nONIk=; b=xKQk1zHox6upKx MuSNVlXPhosGSubxmpWDPM9f1aYIYpJDsuF40PaT/ri40NUjcw9YW4sqo1/wSExnurGdk6c+9bE4U eoeYvG+TFuQirSMgJJF848+IqFPOQM3EbZe49jbKDCzt04X6wZ7isSlkOQs2mC8um/h37U8kRssHR k91p1ssMeQm4ZqLYqA9o8MZ3u49xBiQlfBkP8DyN+kJuoqBpE0q03CT/XDW0/lLHvmIDthgAULxOE Soe4g6dF9MLDIcei8Mj+lp2MSdngetfTsDNjSWH6Ae/HBTsoMN6SXdG5dzssd1PlD31FqeG4552hc bflYdeqGeLE66tdYVGbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r08o2-0007BO-09; Mon, 06 Nov 2023 23:14:54 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r08ny-00079u-2E for linux-arm-kernel@lists.infradead.org; Mon, 06 Nov 2023 23:14:52 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 31E826108D; Mon, 6 Nov 2023 23:14:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 020DCC433CA; Mon, 6 Nov 2023 23:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699312487; bh=t0/mAlfAZXAna5kFgAV5hkD+KoVFFjK4IKREhDZ5t+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pkeaAhmIbGAk2/0bnZUCg8i2CQ5BCdOELoq22jXjlVkk/tEeQ/On+eBsJZtPWDxn3 KOrUk8lADLYceRYERhNuUjyfa3Jq7aXDv2fi4n4Z/aUksYhXipk3Mr15UOtzspEOPn 1esop7oI5MS0lwQKSLlpK+7kiWyefgckAPWj0FQa6IUbwbUu9EgU8lPK7JuMu6y5OD ZXQLbiKgs65tbWPzxkXWnFEG/G4UAdr8Fm1hj1g16FhMSflG664NEGTGffPyRbUXKZ +Hj6mPj6WD313UdU3kI4bCvTJQwKSH4dxDdDqZ4G+8bzumGLC7NpaW2kscykEarVqu hfwAzJFKI0+fA== 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.6 06/13] clocksource/drivers/timer-imx-gpt: Fix potential memory leak Date: Mon, 6 Nov 2023 18:14:19 -0500 Message-ID: <20231106231435.3734790-6-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106231435.3734790-1-sashal@kernel.org> References: <20231106231435.3734790-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231106_151450_767842_BCE72D21 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 28ab4f1a7c713..6a878d227a13b 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -434,12 +434,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"); @@ -452,11 +456,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