Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Message-ID: <fb963c37-db12-0f1c-c9a6-d67095ccaba1@pengutronix.de>
Date:   Tue, 21 Nov 2023 10:37:36 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH] ARM: imx: Check return value of devm_kasprintf in
 imx_mmdc_perf_init
Content-Language: en-US
To:     Kunwu Chan <chentao@kylinos.cn>, linux@armlinux.org.uk,
        shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de,
        festevam@gmail.com, linux-imx@nxp.com, angus.chen@jaguarmicro.com,
        arnd@arndb.de, u.kleine-koenig@pengutronix.de
Cc:     linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        kunwu.chan@hotmail.com
References: <20231121092526.6708-1-chentao@kylinos.cn>
From:   Ahmad Fatoum <a.fatoum@pengutronix.de>
In-Reply-To: <20231121092526.6708-1-chentao@kylinos.cn>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hello Kunwu,

On 21.11.23 10:25, Kunwu Chan wrote:
> devm_kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure. Ensure the allocation was successful
> by checking the pointer validity.
> 
> Fixes: ebeb49f43c89 ("ARM: imx: Call ida_simple_remove() for ida_simple_get")

This commit only moves the allocation around, but it didn't introduce it.
Please reference the first commit that added the allocation.

> Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
> ---
>  arch/arm/mach-imx/mmdc.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
> index 2157493b78a9..7c471d6a851d 100644
> --- a/arch/arm/mach-imx/mmdc.c
> +++ b/arch/arm/mach-imx/mmdc.c
> @@ -501,6 +501,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
>  
>  	name = devm_kasprintf(&pdev->dev,
>  				GFP_KERNEL, "mmdc%d", ret);
> +	if (!name) {
> +		ret = -ENOMEM;
> +		goto pmu_free;

Cleanup is incomplete if you goto pmu_free, e.g. ida_simple_remove()
isn't called. pmu_register_err does too much cleanup, so you'll need
to add a new cleanup label.

Cheers,
Ahmad


> +	}
>  
>  	pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
>  	pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |