[PATCH v2] PCI: dwc: fix error return code in dw_pcie_host_init()

[PATCH v2] PCI: dwc: fix error return code in dw_pcie_host_init()

[Wang Hai]

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 07940c369a6b ("PCI: dwc: Fix MSI page leakage in suspend/resume")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
v1->v2: just add 'ret = xxx'
 drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 44c2a6572199..42d8116a4a00 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -392,7 +392,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
 						      sizeof(pp->msi_msg),
 						      DMA_FROM_DEVICE,
 						      DMA_ATTR_SKIP_CPU_SYNC);
-			if (dma_mapping_error(pci->dev, pp->msi_data)) {
+			ret = dma_mapping_error(pci->dev, pp->msi_data);
+			if (ret) {
 				dev_err(pci->dev, "Failed to map MSI data\n");
 				pp->msi_data = 0;
 				goto err_free_msi;
-- 
2.17.1

Re: [PATCH v2] PCI: dwc: fix error return code in dw_pcie_host_init()

[Jisheng Zhang]

On Tue, 17 Nov 2020 14:41:42 +0800 Wang Hai <wanghai38@huawei.com> wrote:


> 
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
> 
> Fixes: 07940c369a6b ("PCI: dwc: Fix MSI page leakage in suspend/resume")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>

Reviewed-by Jisheng Zhang <Jisheng.Zhang@synaptics.com>

> ---
> v1->v2: just add 'ret = xxx'
>  drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
> index 44c2a6572199..42d8116a4a00 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> @@ -392,7 +392,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
>                                                       sizeof(pp->msi_msg),
>                                                       DMA_FROM_DEVICE,
>                                                       DMA_ATTR_SKIP_CPU_SYNC);
> -                       if (dma_mapping_error(pci->dev, pp->msi_data)) {
> +                       ret = dma_mapping_error(pci->dev, pp->msi_data);
> +                       if (ret) {
>                                 dev_err(pci->dev, "Failed to map MSI data\n");
>                                 pp->msi_data = 0;
>                                 goto err_free_msi;
> --
> 2.17.1
> 

Re: [PATCH v2] PCI: dwc: fix error return code in dw_pcie_host_init()

[Krzysztof Wilczyński]

Hi Hai,

Thank you for taking care about this.

On 20-11-17 14:41:42, Wang Hai wrote:

I would have to ask you to capitalise the first letter in the subject
line as it has been done for other patches.  Check Git history to see
what it normally would look like.

> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.

The above commit message was taken from the first patch, and might not
be accurate any more.  As now you are passing an error code from the
dma_mapping_error() function rather than just setting the ret variable.

Also, the ret variable might have either undetermined value or some
other value from previous assignment, not necessarily 0 there.

Krzysztof