diff options
| author | Gleb Natapov <gleb@redhat.com> | 2011-10-05 14:01:24 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-11-02 14:46:16 +0200 |
| commit | 7e0612168388080e63405790bcf6759b7100de37 (patch) | |
| tree | ca67e40436278c1b693facea8013dcbd03936ac0 | |
| parent | 038c45e7029d5c6ee1fc5cbacd3ddbfaeef5de51 (diff) | |
| download | kvm-next.tar.gz | |
KVM: VMX: Check for automatic switch msr table overflownext
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/kvm/vmx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index d0d4afafdafc7..6e28d582a514d 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); |