]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI/ACPI: Fix pci_acpi_preserve_config() memory leak
authorNirmoy Das <nirmoyd@nvidia.com>
Mon, 25 Aug 2025 21:46:42 +0000 (14:46 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 27 Aug 2025 22:28:07 +0000 (17:28 -0500)
pci_acpi_preserve_config() leaks memory by returning early without freeing
the ACPI object on success. Fix that by always freeing the obj, which is
not needed by the caller.

Fixes: 9d7d5db8e78e ("PCI: Move PRESERVE_BOOT_CONFIG _DSM evaluation to pci_register_host_bridge()")
Signed-off-by: Nirmoy Das <nirmoyd@nvidia.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20250825214642.142135-1-nirmoyd@nvidia.com
drivers/pci/pci-acpi.c

index ddb25960ea47d14b5f28bdace2bc42a07640ad06..9369377725fa030b6137df19caab0e298de87e60 100644 (file)
@@ -122,6 +122,8 @@ phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle)
 
 bool pci_acpi_preserve_config(struct pci_host_bridge *host_bridge)
 {
+       bool ret = false;
+
        if (ACPI_HANDLE(&host_bridge->dev)) {
                union acpi_object *obj;
 
@@ -135,11 +137,11 @@ bool pci_acpi_preserve_config(struct pci_host_bridge *host_bridge)
                                              1, DSM_PCI_PRESERVE_BOOT_CONFIG,
                                              NULL, ACPI_TYPE_INTEGER);
                if (obj && obj->integer.value == 0)
-                       return true;
+                       ret = true;
                ACPI_FREE(obj);
        }
 
-       return false;
+       return ret;
 }
 
 /* _HPX PCI Setting Record (Type 0); same as _HPP */