Commit 98ae70cc authored Feb 14, 2019 by Xiaoyao Li Committed by Paolo Bonzini Feb 14, 2019

kvm: vmx: Fix entry number check for add_atomic_switch_msr()



Commit ca83b4a7 ("x86/KVM/VMX: Add find_msr() helper function")
introduces the helper function find_msr(), which returns -ENOENT when
not find the msr in vmx->msr_autoload.guest/host. Correct checking contion
of no more available entry in vmx->msr_autoload.

Fixes: ca83b4a7 ("x86/KVM/VMX: Add find_msr() helper function")
Cc: stable@vger.kernel.org
Signed-off-by: Xiaoyao Li <xiaoyao.li@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent c112b5f5

arch/x86/kvm/vmx/vmx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -863,7 +863,8 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,
		if (!entry_only)
		j = find_msr(&m->host, msr);

		if (i == NR_AUTOLOAD_MSRS \|\| j == NR_AUTOLOAD_MSRS) {
		if ((i < 0 && m->guest.nr == NR_AUTOLOAD_MSRS) \|\|
		(j < 0 && m->host.nr == NR_AUTOLOAD_MSRS)) {
		printk_once(KERN_WARNING "Not enough msr switch entries. "
		"Can't add msr %x\n", msr);
		return;

Admin message