Commit 1ded56df authored Jan 21, 2017 by Dan Carpenter Committed by Bjorn Helgaas Jan 30, 2017

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: c5d46039 ("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>

parent 7ce7d89f

drivers/pci/host/pci-xgene.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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;