Unverified Commit 631b2af2 authored by Zhe Qiao's avatar Zhe Qiao Committed by Krzysztof Wilczyński
Browse files

PCI/ACPI: Fix allocated memory release on error in pci_acpi_scan_root() 



In the pci_acpi_scan_root() function, when creating a PCI bus fails,
we need to free up the previously allocated memory, which can avoid
invalid memory usage and save resources.

Fixes: 789befdf ("arm64: PCI: Migrate ACPI related functions to pci-acpi.c")
Signed-off-by: default avatarZhe Qiao <qiaozhe@iscas.ac.cn>
[kwilczynski: commit log]
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20250430060603.381504-1-qiaozhe@iscas.ac.cn
parent 0af2f6be

drivers/pci/pci-acpi.c

+13 −10
Original line number Diff line number Diff line
@@ -1676,24 +1676,19 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		return NULL;



	root_ops = kzalloc(sizeof(*root_ops), GFP_KERNEL);

	if (!root_ops) {

		kfree(ri);

		return NULL;

	}

	if (!root_ops)

		goto free_ri;



	ri->cfg = pci_acpi_setup_ecam_mapping(root);

	if (!ri->cfg) {

		kfree(ri);

		kfree(root_ops);

		return NULL;

	}

	if (!ri->cfg)

		goto free_root_ops;



	root_ops->release_info = pci_acpi_generic_release_info;

	root_ops->prepare_resources = pci_acpi_root_prepare_resources;

	root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;

	bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);

	if (!bus)

		return NULL;

		goto free_cfg;



	/* If we must preserve the resource configuration, claim now */

	host = pci_find_host_bridge(bus);
@@ -1710,6 +1705,14 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		pcie_bus_configure_settings(child);



	return bus;



free_cfg:

	pci_ecam_free(ri->cfg);

free_root_ops:

	kfree(root_ops);

free_ri:

	kfree(ri);

	return NULL;

}



void pcibios_add_bus(struct pci_bus *bus)