[src/netbsd-6]: src/sys/arch/xen/xen Pull up revision 1.12 (requested by jym ...

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/296734e3ed28
branches:  netbsd-6
changeset: 774361:296734e3ed28
user:      jdc <jdc%NetBSD.org@localhost>
date:      Wed Jul 25 20:52:53 2012 +0000

description:
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.

diffstat:

 sys/arch/xen/xen/xen_machdep.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 5e143438f02c -r 296734e3ed28 sys/arch/xen/xen/xen_machdep.c
--- a/sys/arch/xen/xen/xen_machdep.c    Wed Jul 25 20:50:44 2012 +0000
+++ b/sys/arch/xen/xen/xen_machdep.c    Wed Jul 25 20:52:53 2012 +0000
@@ -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 @@
            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 @@
 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)