| Message ID | 1386948196-9409-1-git-send-email-betty.dall@hp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index cf611ab..39186e3 100644 --- a/drivers/pci/pcie/aer/aerdrv_acpi.c +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c @@ -56,6 +56,10 @@ static int aer_hest_parse(struct acpi_hest_header *hest_hdr, void *data) struct acpi_hest_aer_common *p; int ff; + if (hest_hdr->type != ACPI_HEST_TYPE_AER_ROOT_PORT && + hest_hdr->type != ACPI_HEST_TYPE_AER_ENDPOINT && + hest_hdr->type != ACPI_HEST_TYPE_AER_BRIDGE) + return 0; p = (struct acpi_hest_aer_common *)(hest_hdr + 1); ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST); if (p->flags & ACPI_HEST_GLOBAL) {
aer_hest_parse() could pass a non-AER HEST error source to the function hest_match_pci(). hest_match_pci() assumes that the HEST error source is type ACPI_HEST_TYPE_AER_ROOT_PORT, ACPI_HEST_TYPE_AER_ENDPOINT, or ACPI_HEST_TYPE_AER_BRIDGE. I have a platform that has some ACPI_HEST_TYPE_GENERIC error sources where hest_match_pci() was trying to access the structure as if it had the acpi_hest_aer_common fields. aer_hest_parse() is only ever interested in the AER type HEST error sources. Add a check on the type of the error souce at the beginning of aer_hest_parse(). Signed-off-by: Betty Dall <betty.dall@hp.com> --- drivers/pci/pcie/aer/aerdrv_acpi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html