Module Name: src
Committed By: jmcneill
Date: Thu Apr 9 10:46:19 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi.c
Log Message:
Stop walking MADT / GTDT subtables if we hit a header with length 0
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/sys/dev/acpi/acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.283 src/sys/dev/acpi/acpi.c:1.284
--- src/sys/dev/acpi/acpi.c:1.283 Fri Jan 17 17:06:32 2020
+++ src/sys/dev/acpi/acpi.c Thu Apr 9 10:46:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.283 2020/01/17 17:06:32 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.284 2020/04/09 10:46:19 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.283 2020/01/17 17:06:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.284 2020/04/09 10:46:19 jmcneill Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -1809,7 +1809,7 @@ acpi_madt_walk(ACPI_STATUS (*func)(ACPI_
hdrp = (ACPI_SUBTABLE_HEADER *)where;
- if (ACPI_FAILURE(func(hdrp, aux)))
+ if (hdrp->Length == 0 || ACPI_FAILURE(func(hdrp, aux)))
break;
where += hdrp->Length;
@@ -1829,7 +1829,7 @@ acpi_gtdt_walk(ACPI_STATUS (*func)(ACPI_
hdrp = (ACPI_GTDT_HEADER *)where;
- if (ACPI_FAILURE(func(hdrp, aux)))
+ if (hdrp->Length == 0 || ACPI_FAILURE(func(hdrp, aux)))
break;
where += hdrp->Length;
