From nobody Thu Dec 18 05:00:49 2025 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 8156BC25B6F for ; Fri, 27 Oct 2023 18:31:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235176AbjJ0Sbf (ORCPT ); Fri, 27 Oct 2023 14:31:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346394AbjJ0SbT (ORCPT ); Fri, 27 Oct 2023 14:31:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CB60171D; Fri, 27 Oct 2023 11:23:44 -0700 (PDT) Date: Fri, 27 Oct 2023 18:23:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1698430993; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fw2xBMxpLrv+XNAvx9BRKtkO3b97IRYUnJKfUKQGM4I=; b=xdNzJ6ZBE6HlbCvE/E3ixYSzWptoKVh0GgwQY16WWXW8e0Bl1AVzFDxuqphDhWMmmNxE00 R+SNB8cY3VpVcbACmwwubb9DQXYmBQAhkToC2/pFvLFlYc73KtIM8lrOFsiw3os++mBaEA Lcqucgkqt8quv1qbMjJHsEDAI1QgvKMv3MngC3pptjBghHNuT4ax0jYcBG46R3dQ5FKlJJ eLOi8RL1bnyQHAErcTZuzZZM4iSxdMCsAz4scSESBQlyTt976kVaYTkhE0Q9QltnednJ8m Eqr99ldnx+ad7RjPwHv5Fh+kMKddawOTaFROtD5ypge5UM92RrfIGPJfNj62FQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1698430993; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fw2xBMxpLrv+XNAvx9BRKtkO3b97IRYUnJKfUKQGM4I=; b=V5XElj0SglB3dBVt3q47B3nfSkntVhy27fsAXCOSB6NjbP2mXIBJ1smd8LKvYKJC2I+1iU s8JVPfHe8z+IQsDQ== From: "tip-bot2 for Jacky Bai" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/timer-imx-gpt: Fix potential memory leak Cc: Jacky Bai , Peng Fan , Daniel Lezcano , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231009083922.1942971-1-ping.bai@nxp.com> References: <20231009083922.1942971-1-ping.bai@nxp.com> MIME-Version: 1.0 Message-ID: <169843099292.3135.663516180882506542.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: 8051a993ce222a5158bccc6ac22ace9253dd71cb Gitweb: https://git.kernel.org/tip/8051a993ce222a5158bccc6ac22ace925= 3dd71cb Author: Jacky Bai AuthorDate: Mon, 09 Oct 2023 16:39:22 +08:00 Committer: Daniel Lezcano CommitterDate: Wed, 11 Oct 2023 10:10:34 +02:00 clocksource/drivers/timer-imx-gpt: Fix potential memory leak 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 --- 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/time= r-imx-gpt.c index 28ab4f1..6a878d2 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_nod= e *np, enum imx_gpt_type t return -ENOMEM; =20 imxtm->base =3D of_iomap(np, 0); - if (!imxtm->base) - return -ENXIO; + if (!imxtm->base) { + ret =3D -ENXIO; + goto err_kfree; + } =20 imxtm->irq =3D irq_of_parse_and_map(np, 0); - if (imxtm->irq <=3D 0) - return -EINVAL; + if (imxtm->irq <=3D 0) { + ret =3D -EINVAL; + goto err_kfree; + } =20 imxtm->clk_ipg =3D of_clk_get_by_name(np, "ipg"); =20 @@ -452,11 +456,15 @@ static int __init mxc_timer_init_dt(struct device_nod= e *np, enum imx_gpt_type t =20 ret =3D _mxc_timer_init(imxtm); if (ret) - return ret; + goto err_kfree; =20 initialized =3D 1; =20 return 0; + +err_kfree: + kfree(imxtm); + return ret; } =20 static int __init imx1_timer_init_dt(struct device_node *np)