x86/PCI: Fix use after free in pci_acpi_root_prepare_resources()
Subsystems (4)
PATCH 1/1 x86/PCI: Fix use after free in pci_acpi_root_prepare_resources()
The resource_list_destroy_entry() function frees "entry", so move the dereferences before the free.
Fixes 62fabd56faaf ("x86/PCI: Disable exclusion of E820 reserved addresses in some cases")
Signed-off-by Dan Carpenter <[email protected]>
--- arch/x86/pci/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/acpi.c +2 -2
@@ -357,14 +357,14 @@ static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci) status =acpi_pci_probe_root_resources (ci);if (pci_use_crs) {resource_list_for_each_entry_safe (entry, tmp, &ci->resources) { -if (resource_is_pcicfg_ioport (entry->res)) -resource_list_destroy_entry (entry);if (resource_is_efi_mmio_region (entry->res)) {dev_info (&device->dev,"host bridge window %pR is marked by EFI as MMIO\n" , entry->res); pci_use_e820 = false; } +if (resource_is_pcicfg_ioport (entry->res)) +resource_list_destroy_entry (entry); }return status; }
Signature · 1 line
2.20.1
Hi,
Quoted 20 lines · Dan Carpenter
The
resource_list_destroy_entry()function frees "entry", so move the dereferences before the free.Fixes 62fabd56faaf ("x86/PCI: Disable exclusion of E820 reserved addresses in some cases")Signed-off-by Dan Carpenter <[email protected]>--- arch/x86/pci/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/pci/acpi.c +0
-2@@ -357,14 +357,14 @@ static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci) status =acpi_pci_probe_root_resources (ci);if (pci_use_crs) {resource_list_for_each_entry_safe (entry, tmp, &ci->resources) { -if (resource_is_pcicfg_ioport (entry->res)) -resource_list_destroy_entry (entry);if (resource_is_efi_mmio_region (entry->res)) {
arch/x86/pci/acpi.c static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci) · line 370
Quoted 10 lines
arch/x86/pci/acpi.c +2
-0dev_info (&device->dev,"host bridge window %pR is marked by EFI as MMIO\n" , entry->res); pci_use_e820 = false; } +if (resource_is_pcicfg_ioport (entry->res)) +resource_list_destroy_entry (entry); }return status; }
Thank you, I actually send a new version of that commit to replace the original one also addressing some other issues:
https://lore.kernel.org/linux-acpi/[email protected]/
I expect Rafael to pick up the new version, resolving this. But maybe Rafael prefers a follow up commit instead ?
Regards,
Hans