IronPort-SDR: XBKBzC7dF77Dnz9n1/NGTz489N5czyJLvcz3974x0NUcc95fZZ1ivTI6N9562PfgQIJ6P+hkB6
 2ZT9KvnX40UOzHGbfUe6DjFaz0/sDW1Z5G98aGQMvEyIMR41WvnGukqA4k3cWulN6HEPy/45X4
 /GW8CVZJww5whtEPiSU9Mn7kPZE+72UVFlCvyQzYsPCj+gYkzuTbGrAL2eFa7f+ZMcJAjvct9E
 XE/k30C88o2HJUYwur1JNaEvT0+//1jyfSA78ByBJlV1QsdC/06/sDrEYoPq7ojO7Wa7z4OFwq
 SOM=
IronPort-SDR: dmmZoy7hoQ/Gdvc4AqTLrmE+NTr5kLnFj8Yv5sb9Ov7LYXb8ArF+uZWnFzcb/r1a8QeKns6fdc
 WfcM7TGnFuORCTu4pT/unxJoAgWlfxnEdVs00Hwdm+sZ2/ApJQ43UwpnF5RSB7tdCyA5rcEGYM
 xMOHQnlgu2b+wV43W6NSH7BfyzPEH331IpjqOe1lII4CajNV7S+adUQHOgiPaz5yqYtwseTVSP
 XLfFesOSlLktO9kmRvPBjdJ57LNLmQqAl0y8s+VQzISSgqYQ7m3lk5JrKtLLQ0Gxf+TBXRphT/
 Fw8=
WDCIronportException: Internal
Message-ID: <8b0eb4d0-ca10-35a5-a74c-fd0f7d11713c@opensource.wdc.com>
Date:   Sun, 12 Mar 2023 09:56:25 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [PATCH v2] pata_parport: fix possible memory leak
To:     Ondrej Zary <linux@zary.sk>
Cc:     Christoph Hellwig <hch@lst.de>,
        Sergey Shtylyov <s.shtylyov@omp.ru>, linux-ide@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <202303112239.21234.linux@zary.sk>
 <20230311214447.7359-1-linux@zary.sk>
Content-Language: en-US
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital Research
In-Reply-To: <20230311214447.7359-1-linux@zary.sk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 3/12/23 06:44, Ondrej Zary wrote:
> When ida_alloc() fails, "pi" is not freed although the misleading
> comment says otherwise.
> Move the ida_alloc() call up so we really don't have to free it.

Certainly you meant: "so we really do free it in case of error.", no ?

> 
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Dan Carpenter <error27@gmail.com>
> Link: https://lore.kernel.org/r/202303111822.IHNchbkp-lkp@intel.com/
> Signed-off-by: Ondrej Zary <linux@zary.sk>
> ---
>  drivers/ata/pata_parport/pata_parport.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c
> index 6165ee9aa7da..a9eff6003098 100644
> --- a/drivers/ata/pata_parport/pata_parport.c
> +++ b/drivers/ata/pata_parport/pata_parport.c
> @@ -503,18 +503,19 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
>  	if (bus_for_each_dev(&pata_parport_bus_type, NULL, &match, pi_find_dev))
>  		return NULL;
>  
> +	id = ida_alloc(&pata_parport_bus_dev_ids, GFP_KERNEL);
> +	if (id < 0)
> +		return NULL;
> +
>  	pi = kzalloc(sizeof(struct pi_adapter), GFP_KERNEL);
>  	if (!pi)
> -		return NULL;
> +		goto out_ida_free;
>  
>  	/* set up pi->dev before pi_probe_unit() so it can use dev_printk() */
>  	pi->dev.parent = &pata_parport_bus;
>  	pi->dev.bus = &pata_parport_bus_type;
>  	pi->dev.driver = &pr->driver;
>  	pi->dev.release = pata_parport_dev_release;
> -	id = ida_alloc(&pata_parport_bus_dev_ids, GFP_KERNEL);
> -	if (id < 0)
> -		return NULL; /* pata_parport_dev_release will do kfree(pi) */
>  	pi->dev.id = id;
>  	dev_set_name(&pi->dev, "pata_parport.%u", pi->dev.id);
>  	if (device_register(&pi->dev)) {
> @@ -571,7 +572,7 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
>  out_unreg_dev:
>  	device_unregister(&pi->dev);

Same comment as Sergey: isn't this going to do the ida free ? So shouldn't you
return here ?

>  out_ida_free:
> -	ida_free(&pata_parport_bus_dev_ids, pi->dev.id);
> +	ida_free(&pata_parport_bus_dev_ids, id);
>  	return NULL;
>  }
>  

-- 
Damien Le Moal
Western Digital Research