summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2011-10-05 14:01:24 +0200
committerAvi Kivity <avi@redhat.com>2011-11-17 16:28:09 +0200
commite7fc6f93b4242b2b566f0070709e27257d6da8a2 (patch)
treee247492b58735178c1c82eb8c23e86b0472077c0 /arch
parentd7cd97964ba6d70c558348bd2c87290dce885583 (diff)
downloadlinux-3.10-e7fc6f93b4242b2b566f0070709e27257d6da8a2.tar.gz
linux-3.10-e7fc6f93b4242b2b566f0070709e27257d6da8a2.tar.bz2
linux-3.10-e7fc6f93b4242b2b566f0070709e27257d6da8a2.zip
KVM: VMX: Check for automatic switch msr table overflow
Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/vmx.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 98f4b0bcc66..579a0b51696 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1280,7 +1280,11 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,
if (m->guest[i].index == msr)
break;
- if (i == m->nr) {
+ if (i == NR_AUTOLOAD_MSRS) {
+ printk_once(KERN_WARNING"Not enough mst switch entries. "
+ "Can't add msr %x\n", msr);
+ return;
+ } else if (i == m->nr) {
++m->nr;
vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, m->nr);
vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, m->nr);