summaryrefslogtreecommitdiff
path: root/sys/dev/acpi
diff options
context:
space:
mode:
authorjruoho <jruoho@NetBSD.org>2010-08-11 18:15:52 +0000
committerjruoho <jruoho@NetBSD.org>2010-08-11 18:15:52 +0000
commitaa6fdddc15293f9f822de6dbf0bedf5e7debdb8a (patch)
treeec48a381ec4012a42294ddb92dab891349d7e288 /sys/dev/acpi
parent5fa58d5e6227f5f3da26e422bc19e20c6ba61c99 (diff)
Properly protect against garbage values.
Diffstat (limited to 'sys/dev/acpi')
-rw-r--r--sys/dev/acpi/acpi_cpu_pstate.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/acpi/acpi_cpu_pstate.c b/sys/dev/acpi/acpi_cpu_pstate.c
index daf90b12fe9..070f88c122a 100644
--- a/sys/dev/acpi/acpi_cpu_pstate.c
+++ b/sys/dev/acpi/acpi_cpu_pstate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.12 2010/08/11 16:41:19 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.13 2010/08/11 18:15:52 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.12 2010/08/11 16:41:19 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.13 2010/08/11 18:15:52 jruoho Exp $");
#include <sys/param.h>
#include <sys/evcnt.h>
@@ -305,8 +305,10 @@ acpicpu_pstate_pss(struct acpicpu_softc *sc)
ps = &sc->sc_pstate[i];
rv = acpicpu_pstate_pss_add(ps, &obj->Package.Elements[i]);
- if (ACPI_FAILURE(rv))
+ if (ACPI_FAILURE(rv)) {
+ ps->ps_freq = 0;
continue;
+ }
for (j = 0; j < i; j++) {
@@ -356,9 +358,6 @@ acpicpu_pstate_pss_add(struct acpicpu_pstate *ps, ACPI_OBJECT *obj)
val[i] = elm[i].Integer.Value;
}
- if (val[0] == 0 || val[0] >= 0xFFFF)
- return AE_BAD_DECIMAL_CONSTANT;
-
CTASSERT(sizeof(val) == sizeof(struct acpicpu_pstate) -
offsetof(struct acpicpu_pstate, ps_freq));
@@ -367,6 +366,9 @@ acpicpu_pstate_pss_add(struct acpicpu_pstate *ps, ACPI_OBJECT *obj)
for (i = 0; i < 6; i++, p++)
*p = val[i];
+ if (ps->ps_freq == 0 || ps->ps_freq > 9999)
+ return AE_BAD_DECIMAL_CONSTANT;
+
/*
* The latency is typically around 10 usec
* on Intel CPUs. Use that as the minimum.