From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 21 Apr 2015 07:03:15 +0000 (+0200)
Subject: domctl/sysctl: don't leak hypervisor stack to toolstacks
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3402
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ff3449f0e9d175ceb9551d3f2aecb59273f639d;p=xen.git

domctl/sysctl: don't leak hypervisor stack to toolstacks

This is CVE-2015-3340 / XSA-132.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 9450795bd2..0b3d6782c6 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -884,7 +884,7 @@ long arch_do_domctl(
 
     case XEN_DOMCTL_gettscinfo:
     {
-        xen_guest_tsc_info_t info;
+        xen_guest_tsc_info_t info = { 0 };
 
         ret = -EINVAL;
         if ( d == current->domain ) /* no domain_pause() */
diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index 70413cc5c9..373c84e4d2 100644
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
     case XEN_SYSCTL_getdomaininfolist:
     { 
         struct domain *d;
-        struct xen_domctl_getdomaininfo info;
+        struct xen_domctl_getdomaininfo info = { 0 };
         u32 num_domains = 0;
 
         rcu_read_lock(&domlist_read_lock);