From: Avi Kivity <avi@redhat.com>
Date: Sat, 6 Jun 2009 09:34:39 +0000 (+0300)
Subject: KVM: Explicity initialize cpus_hardware_enabled
X-Git-Tag: v2.6.29.5~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfc71900a3fb609ce62b9b2e7bb9f5eac7a3f682;p=thirdparty%2Fkernel%2Fstable.git

KVM: Explicity initialize cpus_hardware_enabled

commit a4c0364be3f43d3e17fe19270f8b3d64881606e6 upstream.

Under CONFIG_MAXSMP, cpus_hardware_enabled is allocated from the heap and
not statically initialized.  This causes a crash on reboot when kvm thinks
vmx is enabled on random nonexistent cpus and accesses nonexistent percpu
lists.

Fix by explicitly clearing the variable.

Reported-and-tested-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index d85642e2c74d9..9138d0d75539b 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2315,6 +2315,7 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
 		r = -ENOMEM;
 		goto out_free_0;
 	}
+	cpumask_clear(cpus_hardware_enabled);
 
 	r = kvm_arch_hardware_setup();
 	if (r < 0)