| Message ID | 20220810213050.2655000-1-jmattson@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: VMX: Heed the 'msr' argument in msr_write_intercepted() | expand |
On Wed, Aug 10, 2022, Jim Mattson wrote: > Regardless of the 'msr' argument passed to the VMX version of > msr_write_intercepted(), the function always checks to see if a > specific MSR (IA32_SPEC_CTRL) is intercepted for write. This behavior > seems unintentional and unexpected. > > Modify the function so that it checks to see if the provided 'msr' > index is intercepted for write. > > Fixes: 67f4b9969c30 ("KVM: nVMX: Handle dynamic MSR intercept toggling") > Cc: Sean Christopherson <seanjc@google.com> > Signed-off-by: Jim Mattson <jmattson@google.com> > --- I could have sworn this got fixed already. Or maybe Aaron just pointed it out off-list? Reviewed-by: Sean Christopherson <seanjc@google.com>
Queued, thanks. Paolo
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index d7f8331d6f7e..c9b49a09e6b5 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -843,8 +843,7 @@ static bool msr_write_intercepted(struct vcpu_vmx *vmx, u32 msr) if (!(exec_controls_get(vmx) & CPU_BASED_USE_MSR_BITMAPS)) return true; - return vmx_test_msr_bitmap_write(vmx->loaded_vmcs->msr_bitmap, - MSR_IA32_SPEC_CTRL); + return vmx_test_msr_bitmap_write(vmx->loaded_vmcs->msr_bitmap, msr); } unsigned int __vmx_vcpu_run_flags(struct vcpu_vmx *vmx)
Regardless of the 'msr' argument passed to the VMX version of msr_write_intercepted(), the function always checks to see if a specific MSR (IA32_SPEC_CTRL) is intercepted for write. This behavior seems unintentional and unexpected. Modify the function so that it checks to see if the provided 'msr' index is intercepted for write. Fixes: 67f4b9969c30 ("KVM: nVMX: Handle dynamic MSR intercept toggling") Cc: Sean Christopherson <seanjc@google.com> Signed-off-by: Jim Mattson <jmattson@google.com> --- arch/x86/kvm/vmx/vmx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)