Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] pci/hotplug: fix potential memory leak in disable_slot()
To:     Zhiqiang Liu <liuzhiqiang26@huawei.com>
Cc:     linux-s390@vger.kernel.org, linux-pci@vger.kernel.org,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        linfeilong <linfeilong@huawei.com>,
        gerald.schaefer@linux.ibm.com, bhelgaas@google.com
References: <245c1063-f0cf-551a-b93c-1a0a5ac06eff@huawei.com>
From:   Niklas Schnelle <schnelle@linux.ibm.com>
Message-ID: <64ab0093-b4b6-834f-4249-d38e1e1637c0@linux.ibm.com>
Date:   Mon, 22 Mar 2021 10:42:33 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.8.1
MIME-Version: 1.0
In-Reply-To: <245c1063-f0cf-551a-b93c-1a0a5ac06eff@huawei.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 21/03/2021 16:51, Zhiqiang Liu wrote:
> 
> In disable_slot(), if we obtain desired PCI device
> successfully by calling pci_get_slot(), we should
> call pci_dev_put() to release its reference.

Thanks for the patch! This should however be fixed independently by 
commit 0b13525c20fe ("s390/pci: fix leak of PCI device structure")
which was just added to v5.12-rc4 and will be backported to stable.
There were a few similar cases that also got fixed by that commit.

> 
> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
> Signed-off-by: Feilong Lin <linfeilong@huawei.com>
> ---
>   drivers/pci/hotplug/s390_pci_hpc.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
> index c9e790c74051..999a34b6fd50 100644
> --- a/drivers/pci/hotplug/s390_pci_hpc.c
> +++ b/drivers/pci/hotplug/s390_pci_hpc.c
> @@ -89,9 +89,11 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
>   		return -EIO;
> 
>   	pdev = pci_get_slot(zdev->zbus->bus, zdev->devfn);
> -	if (pdev && pci_num_vf(pdev)) {
> +	if (pdev) {
> +		rc = pci_num_vf(pdev);
>   		pci_dev_put(pdev);
> -		return -EBUSY;
> +		if (rc)
> +			return -EBUSY;
>   	}
> 
>   	zpci_remove_device(zdev);
>