From nobody Fri Dec 19 03:46:18 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 73F54C77B61 for ; Thu, 13 Apr 2023 13:52:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231431AbjDMNwN (ORCPT ); Thu, 13 Apr 2023 09:52:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231430AbjDMNwJ (ORCPT ); Thu, 13 Apr 2023 09:52:09 -0400 Received: from hust.edu.cn (unknown [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 559944683 for ; Thu, 13 Apr 2023 06:52:03 -0700 (PDT) Received: from dqrubuntu.lan ([172.16.0.254]) (user=flno@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 33DDpasL030134-33DDpasO030134 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 13 Apr 2023 21:51:36 +0800 From: Qinrun Dai To: Daniel Lezcano , Thomas Gleixner , Bartosz Golaszewski Cc: hust-os-kernel-patches@googlegroups.com, Qinrun Dai , linux-kernel@vger.kernel.org Subject: [PATCH v2] drivers: clocksource: fix memory leak in davinci_timer_register Date: Thu, 13 Apr 2023 13:50:37 +0000 Message-Id: <20230413135037.1505799-1-flno@hust.edu.cn> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FEAS-AUTH-USER: flno@hust.edu.cn Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Smatch reports: drivers/clocksource/timer-davinci.c:332 davinci_timer_register() warn: 'base' from ioremap() not released on lines: 274. Fix this and other potential memory leak problems by adding a set of corresponding exit lables. Fixes: 721154f972aa ("clocksource/drivers/davinci: Add support for clockeve= nts") Signed-off-by: Qinrun Dai --- drivers/clocksource/timer-davinci.c | 30 +++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/time= r-davinci.c index 9996c0542520..b1c248498be4 100644 --- a/drivers/clocksource/timer-davinci.c +++ b/drivers/clocksource/timer-davinci.c @@ -257,21 +257,25 @@ int __init davinci_timer_register(struct clk *clk, resource_size(&timer_cfg->reg), "davinci-timer")) { pr_err("Unable to request memory region\n"); - return -EBUSY; + rv =3D -EBUSY; + goto exit_clk_disable; } =20 base =3D ioremap(timer_cfg->reg.start, resource_size(&timer_cfg->reg)); if (!base) { pr_err("Unable to map the register range\n"); - return -ENOMEM; + rv =3D -ENOMEM; + goto exit_mem_region; } =20 davinci_timer_init(base); tick_rate =3D clk_get_rate(clk); =20 clockevent =3D kzalloc(sizeof(*clockevent), GFP_KERNEL); - if (!clockevent) - return -ENOMEM; + if (!clockevent) { + rv =3D -ENOMEM; + goto exit_iounmap_base; + } =20 clockevent->dev.name =3D "tim12"; clockevent->dev.features =3D CLOCK_EVT_FEAT_ONESHOT; @@ -296,7 +300,7 @@ int __init davinci_timer_register(struct clk *clk, "clockevent/tim12", clockevent); if (rv) { pr_err("Unable to request the clockevent interrupt\n"); - return rv; + goto exit_free_clockevent; } =20 davinci_clocksource.dev.rating =3D 300; @@ -323,13 +327,27 @@ int __init davinci_timer_register(struct clk *clk, rv =3D clocksource_register_hz(&davinci_clocksource.dev, tick_rate); if (rv) { pr_err("Unable to register clocksource\n"); - return rv; + goto exit_free_irq; } =20 sched_clock_register(davinci_timer_read_sched_clock, DAVINCI_TIMER_CLKSRC_BITS, tick_rate); =20 return 0; + +exit_free_irq: + free_irq(timer_cfg->irq[DAVINCI_TIMER_CLOCKEVENT_IRQ].start, + clockevent); +exit_free_clockevent: + kfree(clockevent); +exit_iounmap_base: + iounmap(base); +exit_mem_region: + release_mem_region(timer_cfg->reg.start, + resource_size(&timer_cfg->reg)); +exit_clk_disable: + clk_disable_unprepare(clk); + return rv; } =20 static int __init of_davinci_timer_register(struct device_node *np) --=20 2.37.2