Module Name: src
Committed By: martin
Date: Mon Nov 27 19:39:54 UTC 2023
Modified Files:
src/sys/dev/acpi [netbsd-9]: acpi.c
Log Message:
Pull up following revision(s) (requested by abs in ticket #1765):
sys/dev/acpi/acpi.c: revision 1.284
Stop walking MADT / GTDT subtables if we hit a header with length 0
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.278.4.1 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.278 src/sys/dev/acpi/acpi.c:1.278.4.1
--- src/sys/dev/acpi/acpi.c:1.278 Sun Oct 21 13:41:15 2018
+++ src/sys/dev/acpi/acpi.c Mon Nov 27 19:39:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.278 2018/10/21 13:41:15 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.278.4.1 2023/11/27 19:39:53 martin 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.278 2018/10/21 13:41:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.278.4.1 2023/11/27 19:39:53 martin Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -1757,7 +1757,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;
@@ -1777,7 +1777,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;
