Module Name: src
Committed By: jdc
Date: Wed Jul 25 20:52:54 UTC 2012
Modified Files:
src/sys/arch/xen/xen [netbsd-6]: xen_machdep.c
Log Message:
Pull up revision 1.12 (requested by jym in ticket #437).
Don't leak stack content when reading the Xen suspend value.
XXX pull-up to -6.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/arch/xen/xen/xen_machdep.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/xen/xen/xen_machdep.c
diff -u src/sys/arch/xen/xen/xen_machdep.c:1.10 src/sys/arch/xen/xen/xen_machdep.c:1.10.2.1
--- src/sys/arch/xen/xen/xen_machdep.c:1.10 Sun Feb 12 14:38:18 2012
+++ src/sys/arch/xen/xen/xen_machdep.c Wed Jul 25 20:52:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_machdep.c,v 1.10 2012/02/12 14:38:18 jym Exp $ */
+/* $NetBSD: xen_machdep.c,v 1.10.2.1 2012/07/25 20:52:53 jdc Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.10 2012/02/12 14:38:18 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.10.2.1 2012/07/25 20:52:53 jdc Exp $");
#include "opt_xen.h"
@@ -247,7 +247,7 @@ sysctl_xen_suspend_setup(void)
CTL_CREATE, CTL_EOL);
sysctl_createv(NULL, 0, &node, &node,
- CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
+ CTLFLAG_PERMANENT | CTLFLAG_READWRITE | CTLFLAG_IMMEDIATE,
CTLTYPE_INT, "suspend",
SYSCTL_DESCR("Suspend/save current Xen domain"),
sysctl_xen_suspend, 0, NULL, 0,
@@ -257,11 +257,10 @@ sysctl_xen_suspend_setup(void)
static int
sysctl_xen_suspend(SYSCTLFN_ARGS)
{
- int error, t;
+ int error;
struct sysctlnode node;
node = *rnode;
- node.sysctl_data = &t;
error = sysctl_lookup(SYSCTLFN_CALL(&node));
if (error || newp == NULL)
