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

This reverts commit 631b2af2f357 ("PCI/ACPI: Fix allocated memory release
on error in pci_acpi_scan_root()").

The reverted patch causes the 'ri->cfg' and 'root_ops' resources to be
released multiple times.

When acpi_pci_root_create() fails, these resources have already been
released internally by the __acpi_pci_root_release_info() function.

Releasing them again in pci_acpi_scan_root() leads to incorrect behavior
and potential memory issues.

We plan to resolve the issue using a more appropriate fix.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/aEmdnuw715btq7Q5@stanley.mountain/
Signed-off-by: Zhe Qiao <qiaozhe@iscas.ac.cn>
Acked-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/20250619072608.2075475-1-qiaozhe@iscas.ac.cn
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index b78e0e4173244516bca77907aaeb1a0ee1c5d37a..af370628e58393aa0cbdf6d283b3afe33e5effb5 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -1676,19 +1676,24 @@ 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)
-               goto free_ri;
+       if (!root_ops) {
+               kfree(ri);
+               return NULL;
+       }
 
        ri->cfg = pci_acpi_setup_ecam_mapping(root);
-       if (!ri->cfg)
-               goto free_root_ops;
+       if (!ri->cfg) {
+               kfree(ri);
+               kfree(root_ops);
+               return NULL;
+       }
 
        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)
-               goto free_cfg;
+               return NULL;
 
        /* If we must preserve the resource configuration, claim now */
        host = pci_find_host_bridge(bus);
@@ -1705,14 +1710,6 @@ 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)