| From: Paolo Bonzini <pbonzini@redhat.com> |
| Date: Wed, 26 Mar 2014 15:54:00 +0100 |
| Subject: KVM: vmx: fix MPX detection |
| |
| commit 920c837785699bcc48f4a729ba9ee3492f620b95 upstream. |
| |
| kvm_x86_ops is still NULL at this point. Since kvm_init_msr_list |
| cannot fail, it is safe to initialize it before the call. |
| |
| Fixes: 93c4adc7afedf9b0ec190066d45b6d67db5270da |
| Reported-by: Fengguang Wu <fengguang.wu@intel.com> |
| Tested-by: Jet Chen <jet.chen@intel.com> |
| Cc: kvm@vger.kernel.org |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Cc: Brad Spengler <spender@grsecurity.net> |
| [bwh: Dependency of "KVM: x86: expose MSR_TSC_AUX to userspace", |
| applied in 3.2.77] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/x86/kvm/x86.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -5257,9 +5257,10 @@ int kvm_arch_init(void *opaque) |
| goto out; |
| |
| kvm_set_mmio_spte_mask(); |
| - kvm_init_msr_list(); |
| |
| kvm_x86_ops = ops; |
| + kvm_init_msr_list(); |
| + |
| kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK, |
| PT_DIRTY_MASK, PT64_NX_MASK, 0); |
| |
