Browse Source

PCI: xgene: Fix double free on init error

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>
Dan Carpenter 8 years ago
parent
commit
1ded56df32
1 changed files with 2 additions and 5 deletions
  1. 2 5
      drivers/pci/host/pci-xgene.c

+ 2 - 5
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);
 	ret = xgene_get_csr_resource(adev, &csr);
 	if (ret) {
 	if (ret) {
 		dev_err(dev, "can't get CSR resource\n");
 		dev_err(dev, "can't get CSR resource\n");
-		kfree(port);
 		return ret;
 		return ret;
 	}
 	}
 	port->csr_base = devm_ioremap_resource(dev, &csr);
 	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->cfg_base = cfg->win;
 	port->version = ipversion;
 	port->version = ipversion;