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 BD7D8C77B75 for ; Tue, 18 Apr 2023 13:08:32 +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:In-Reply-To:References:Cc:To:Subject: MIME-Version:Date:Message-ID:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aaHoyf+qkSidnqcqSVwDcZClfa2kzIuocjNTI3gLqCA=; b=PfU/vus4WTfTpJ ptuYvOfndhjM+95EDusOOxyjhLkwgGhftZdZxaOfTqDhgLjYn8zyJpDIJlXVB5xJM09KMBmVoN4az suAmZqnqrge21HEPtiC+1k2ocJ3lBi8W8+55sRTkVhCUi3Y2JOzroDNtZPeZA2Zg7eerHzYAna+l3 QDaqlgctyxnjYql+i4YDpXu2Km8qoSiRIPbxK9eDhP2xNk3b2j6dv4hS4PRVHWHKfyVXENJJLerIb IDqiHhEmteiajg+LPn2tPXp2UXEu8uytZ9Z/0raUs3xhB2uy9kQjTeH2v2PNOS2Ib8m/gRBUNWHnf Hice17uecSU4y9VzKtAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pol3a-002EUR-2D; Tue, 18 Apr 2023 13:07:38 +0000 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pol3W-002ETO-2o for linux-arm-kernel@lists.infradead.org; Tue, 18 Apr 2023 13:07:36 +0000 Received: by mail-qv1-xf2d.google.com with SMTP id qh25so18447087qvb.1 for ; Tue, 18 Apr 2023 06:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681823252; x=1684415252; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:user-agent:mime-version:date:message-id:from:from:to :cc:subject:date:message-id:reply-to; bh=qj/ICS6hhIk4a1NquMOIeTqnnyYW5sgIMFbGIy85Z0I=; b=ckbJE+LT0xQyyCMznQ7MZhnCye8WSGm/zHa5db1cnhPcQtUv8reSCXxbvMMFpShGpN 91qKzQANqfmg8LVWvmDkmZGl2r+yv56KoxHtXRp7vgKu9a9SHxoCakRtd0iUyvngsdlM d/6yVLTAt5Uw7wX8XrdoofK4g+DVtOOpycuVqsVb5ovRKGi5HRwT8qdEodIT5yErxHFj h0fqN0fbTNagZNmDjSWat8sYHJvb3JaXDQzxr85ff9VxNBlACA5SEjUea5E3BALiTWn+ 6eqLaKgtj4Trq/JG4Cd47T3zpVa0+4Hc1rZftHY9VYewXJDstKzE8UJDT2k66k5brE1n wKgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681823252; x=1684415252; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:user-agent:mime-version:date:message-id:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qj/ICS6hhIk4a1NquMOIeTqnnyYW5sgIMFbGIy85Z0I=; b=D7PZMbHovGp4mATSr1t1IlNXjxyhzvSRUKsDgq+gYQsUuvCrsADdijy5FeJAn+BRqq 03IwDBMs86PJ1xb3eZoZuOhEiYfxuEZzWHWHfgKA06Hzmu6tFJNqMCCSGKmtvh/aJLXH wcahjJIVw8Mzh2TYPaisvjnUnmYsl0atWHYahX8Pn9WpyxDMDak1KO4gfI95x6wCTtZE hOC1esHIoxqVlRKDHGfkfKHmee+RTtRZVvaEg8j5DKp8xX7q7XRVky/IJU7sfti/HIyd yhbDascLK/vBch1VVZywiUKkrpkpfANIWqJ5QVJJnyn7ymUjYN2p+XHb4X/wSRwBSlYz 3LJQ== X-Gm-Message-State: AAQBX9ckiDekBRCuPDoWo7HV1YIG4radAbzsVSQdAsrNN/SHJ/S7OW22 bun4ht1fobmnz7eOFtuJMBo= X-Google-Smtp-Source: AKy350ZXkVje20+rK7o1OUXV3gohyAeLuzoo+/ikkNQEkWd1GoQ+MQ6E8NXwVhpxd8ywvFSlHl/CAA== X-Received: by 2002:a05:6214:1301:b0:5ac:d562:4ea8 with SMTP id pn1-20020a056214130100b005acd5624ea8mr21972965qvb.9.1681823251900; Tue, 18 Apr 2023 06:07:31 -0700 (PDT) Received: from [10.248.29.213] ([129.63.248.16]) by smtp.gmail.com with ESMTPSA id q1-20020ad44341000000b005ef817d14casm1086641qvs.83.2023.04.18.06.07.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Apr 2023 06:07:22 -0700 (PDT) From: Jesse Taube X-Google-Original-From: Jesse Taube Message-ID: <9a2ab7ec-07ee-255f-a143-9b6c8df7c1e2@gmail.com> Date: Tue, 18 Apr 2023 09:07:20 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: Re: [PATCH] clk: imx: clk-imxrt1050: fix memory leak in imxrt1050_clocks_probe To: Kai Ma , Abel Vesa , Peng Fan , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: hust-os-kernel-patches@googlegroups.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20230418113451.151312-1-kaima@hust.edu.cn> Content-Language: en-US In-Reply-To: <20230418113451.151312-1-kaima@hust.edu.cn> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230418_060734_912916_6EF43830 X-CRM114-Status: GOOD ( 23.67 ) 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 On 4/18/23 07:34, Kai Ma wrote: > Use devm_of_iomap() instead of of_iomap() to automatically > handle the unused ioremap region. If any error occurs, regions allocated by > kzalloc() will leak, but using devm_kzalloc() instead will automatically > free the memory using devm_kfree(). > > Also, fix error handling of hws by adding unregister_hws label, which > unregisters remaining hws when iomap failed. > > Fixes: 7154b046d8f3 ("clk: imx: Add initial support for i.MXRT1050 clock driver") > Signed-off-by: Kai Ma > --- > The issue is found by static analysis and remains untested. > --- > drivers/clk/imx/clk-imxrt1050.c | 22 +++++++++++++++------- > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c > index fd5c51fc92c0..08d155feb035 100644 > --- a/drivers/clk/imx/clk-imxrt1050.c > +++ b/drivers/clk/imx/clk-imxrt1050.c > @@ -42,7 +42,7 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev) > struct device_node *anp; > int ret; > > - clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, > + clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, > IMXRT1050_CLK_END), GFP_KERNEL); > if (WARN_ON(!clk_hw_data)) > return -ENOMEM; > @@ -53,10 +53,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev) > hws[IMXRT1050_CLK_OSC] = imx_get_clk_hw_by_name(np, "osc"); > > anp = of_find_compatible_node(NULL, NULL, "fsl,imxrt-anatop"); > - pll_base = of_iomap(anp, 0); > + pll_base = devm_of_iomap(dev, anp, 0, NULL); > of_node_put(anp); > - if (WARN_ON(!pll_base)) > - return -ENOMEM; > + if (WARN_ON(IS_ERR(pll_base))) { > + ret = PTR_ERR(pll_base); > + goto unregister_hws; > + } > > /* Anatop clocks */ > hws[IMXRT1050_CLK_DUMMY] = imx_clk_hw_fixed("dummy", 0UL); > @@ -104,8 +106,10 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev) > > /* CCM clocks */ > ccm_base = devm_platform_ioremap_resource(pdev, 0); > - if (WARN_ON(IS_ERR(ccm_base))) > - return PTR_ERR(ccm_base); > + if (WARN_ON(IS_ERR(ccm_base))) { > + ret = PTR_ERR(ccm_base); > + goto unregister_hws; > + } > > hws[IMXRT1050_CLK_ARM_PODF] = imx_clk_hw_divider("arm_podf", "pll1_arm", ccm_base + 0x10, 0, 3); > hws[IMXRT1050_CLK_PRE_PERIPH_SEL] = imx_clk_hw_mux("pre_periph_sel", ccm_base + 0x18, 18, 2, > @@ -149,8 +153,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev) > ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data); > if (ret < 0) { > dev_err(dev, "Failed to register clks for i.MXRT1050.\n"); > - imx_unregister_hw_clocks(hws, IMXRT1050_CLK_END); > + goto unregister_hws; > } > + return 0; > + > +unregister_hws: > + imx_unregister_hw_clocks(hws, IMXRT1050_CLK_END); > return ret; > } > static const struct of_device_id imxrt1050_clk_of_match[] = { Looks good! The fix seems to be similar to how clk-imx8mn.c does this. Acked-by: Jesse Taube A similar issue seems to also be in drivers/clk/imx/clk-imx8mm.c,clk-imx93.c,clk-imx8mp.c. Sorry for recreating the issue :(. Thanks, Jesse Taube _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel