Module Name: src
Committed By: jruoho
Date: Thu Dec 30 17:06:17 UTC 2010
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
Log Message:
Add an additional assertion for the control MSR address.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/acpi/acpi_cpu_md.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/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.36 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.37
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.36 Tue Nov 30 18:44:07 2010
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Thu Dec 30 17:06:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.36 2010/11/30 18:44:07 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.37 2010/12/30 17:06:17 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.36 2010/11/30 18:44:07 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.37 2010/12/30 17:06:17 jruoho Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -588,6 +588,9 @@
uint64_t xc;
int rv = 0;
+ if (__predict_false(ps->ps_control_addr == 0))
+ return EINVAL;
+
if ((ps->ps_flags & ACPICPU_FLAG_P_FIDVID) != 0)
return acpicpu_md_pstate_fidvid_set(ps);
