Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <dac8e781-5c2b-4ba1-34a7-d902ba060b29@wanadoo.fr>
Date:   Mon, 1 Aug 2022 20:26:07 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH] mtd: rawnand: denali: Fix a possible resource leak in
 denali_pci_probe
Content-Language: en-US
To:     "GONG, Ruiqi" <gongruiqi1@huawei.com>, miquel.raynal@bootlin.com,
        richard@nod.at, vigneshr@ti.com
Cc:     linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
        wangweiyang2@huawei.com
References: <20220801080315.1713934-1-gongruiqi1@huawei.com>
From:   Christophe JAILLET <christophe.jaillet@wanadoo.fr>
In-Reply-To: <20220801080315.1713934-1-gongruiqi1@huawei.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

Le 01/08/2022 à 10:03, GONG, Ruiqi a écrit :
> Call pci_release_regions() to retrieve the allocated resource when
> devm_ioremap() or denali_init() failed.
> 

Hi,
this is not correct.

First, should you be right, you should also update the .remove() 
function the same way.

Second, at the beginning there is pcim_enable_device() call.
This looked like magic to me when I first saw it, but this function 
makes some pci_ functions work just as it they were pcim_ functions.

See pcim_enable_device() ([1]), at line 2132.
When pcim_release() ([2]) is called by the framework, then regions are 
released at line 2079

CJ

[1]: https://elixir.bootlin.com/linux/v5.19/source/drivers/pci/pci.c#L2118
[2]: https://elixir.bootlin.com/linux/v5.19/source/drivers/pci/pci.c#L2071

> Signed-off-by: GONG, Ruiqi <gongruiqi1@huawei.com>
> ---
>   drivers/mtd/nand/raw/denali_pci.c | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/denali_pci.c b/drivers/mtd/nand/raw/denali_pci.c
> index de7e722d3826..40943cda0914 100644
> --- a/drivers/mtd/nand/raw/denali_pci.c
> +++ b/drivers/mtd/nand/raw/denali_pci.c
> @@ -74,21 +74,22 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
>   		return ret;
>   	}
>   
> +	ret = -ENOMEM;
>   	denali->reg = devm_ioremap(denali->dev, csr_base, csr_len);
>   	if (!denali->reg) {
>   		dev_err(&dev->dev, "Spectra: Unable to remap memory region\n");
> -		return -ENOMEM;
> +		goto out_release_pci;
>   	}
>   
>   	denali->host = devm_ioremap(denali->dev, mem_base, mem_len);
>   	if (!denali->host) {
>   		dev_err(&dev->dev, "Spectra: ioremap failed!");
> -		return -ENOMEM;
> +		goto out_release_pci;
>   	}
>   
>   	ret = denali_init(denali);
>   	if (ret)
> -		return ret;
> +		goto out_release_pci;
>   
>   	nsels = denali->nbanks;
>   
> @@ -116,6 +117,8 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
>   
>   out_remove_denali:
>   	denali_remove(denali);
> +out_release_pci:
> +	pci_release_regions(dev);
>   	return ret;
>   }
>