d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi: Add missing error handling to acpi_pci_link_route_irqs()

Browse Source 
Otherwise the resouce buffer may have been freed when
AcpiSetCurrentResources() is called, leading to a use-after-free.

PR:		255862
Submitted by:	Lv Yunlong <lylgood@foxmail.com> (original version)
MFC after:	1 week
This commit is contained in:
Mark Johnston 2021-05-26 10:34:39 -04:00
parent 27130028a5
commit 4cf3327528
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/acpica/acpi_pci_link.c
View File

@ -843,8 +843,10 @@ acpi_pci_link_srs_from_links(struct acpi_pci_link_softc *sc,
device_printf(sc->pl_dev, device_printf(sc->pl_dev,
"Unable to build resources: %s\n", "Unable to build resources: %s\n",
AcpiFormatException(status)); AcpiFormatException(status));
if (srsbuf->Pointer != NULL) if (srsbuf->Pointer != NULL) {
AcpiOsFree(srsbuf->Pointer); AcpiOsFree(srsbuf->Pointer);
srsbuf->Pointer = NULL;
}
return (status); return (status);
} }
} }
@ -867,6 +869,8 @@ acpi_pci_link_route_irqs(device_t dev)
status = acpi_pci_link_srs_from_links(sc, &srsbuf); status = acpi_pci_link_srs_from_links(sc, &srsbuf);
else else
status = acpi_pci_link_srs_from_crs(sc, &srsbuf); status = acpi_pci_link_srs_from_crs(sc, &srsbuf);
if (ACPI_FAILURE(status))
return (status);
/* Write out new resources via _SRS. */ /* Write out new resources via _SRS. */
status = AcpiSetCurrentResources(acpi_get_handle(dev), &srsbuf); status = AcpiSetCurrentResources(acpi_get_handle(dev), &srsbuf);