PCI: xgene: Fix double free on init error

BugLink: http://bugs.launchpad.net/bugs/1682130
[ Upstream commit 1ded56df3247d358390ae6dc09ccee620262ac5f ]

The "port" variable was allocated with devm_kzalloc() so if we free it with
kfree() it will be freed twice.  Also I changed it to propogate the error
from devm_ioremap_resource() instead of returning -ENOMEM.

Fixes: c5d460396100 ("PCI: Add MCFG quirks for X-Gene host controller")
Also-posted-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Tanmay Inamdar <tinamdar@apm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 7c3b54b9eb17c58a9c80e9dae888faddeba8c546..142a1669dd821151c86363ff75c4cdaa3d99cab7 100644 (file)
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -246,14 +246,11 @@ static int xgene_pcie_ecam_init(struct pci_config_window *cfg, u32 ipversion)
        ret = xgene_get_csr_resource(adev, &csr);
        if (ret) {
                dev_err(dev, "can't get CSR resource\n");
-               kfree(port);
                return ret;
        }
        port->csr_base = devm_ioremap_resource(dev, &csr);
-       if (IS_ERR(port->csr_base)) {
-               kfree(port);
-               return -ENOMEM;
-       }
+       if (IS_ERR(port->csr_base))
+               return PTR_ERR(port->csr_base);
 
        port->cfg_base = cfg->win;
        port->version = ipversion;