summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2017-07-10 13:34:08 +0100
committerBjorn Helgaas <bhelgaas@google.com>2017-07-10 09:33:14 -0500
commitf01fc4177352614743ce3fe289687387fcf9e6c6 (patch)
tree0ee4a920955bfdf490b3b1ac920b2b66c9db753e /arch/arm/kernel
parentaf3c8d98508d37541d4bf57f13a984a7f73a328c (diff)
downloadop-kernel-dev-f01fc4177352614743ce3fe289687387fcf9e6c6.zip
op-kernel-dev-f01fc4177352614743ce3fe289687387fcf9e6c6.tar.gz
ARM/PCI: Fix pcibios_init_resource() struct pci_host_bridge leak
Since commit 97ad2bdcbe85 ("ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()") the space for struct pci_sys_data is allocated by pci_alloc_host_bridge() as part of the struct pci_host_bridge. Therefore, failure paths must deallocate the entire pci_host_bridge by using pci_free_host_bridge(). Fixes: 97ad2bdcbe85 ("ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()") Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> [bhelgaas: changelog] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Russell King <linux@armlinux.org.uk> Cc: Andrew Lunn <andrew@lunn.ch>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/bios32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 56dc1a3..c1809fb 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -480,7 +480,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
ret = pcibios_init_resource(nr, sys, hw->io_optional);
if (ret) {
- kfree(sys);
+ pci_free_host_bridge(bridge);
break;
}
OpenPOWER on IntegriCloud