diff options
| author | Vitaly Kuznetsov <[email protected]> | 2021-05-21 11:51:39 +0200 |
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2021-06-17 13:09:39 -0400 |
| commit | 1561c2cb87ab39400d76998bf7be581c1e57f108 (patch) | |
| tree | 3604a51f1c52589774cc2301c5bad9ca87a71ffe | |
| parent | b4128000e2c9b176a449d748dcb083c61d61cc6e (diff) | |
KVM: x86: hyper-v: Honor HV_MSR_HYPERCALL_AVAILABLE privilege bit
HV_X64_MSR_GUEST_OS_ID/HV_X64_MSR_HYPERCALL are only available to guest
when HV_MSR_HYPERCALL_AVAILABLE bit is exposed.
Signed-off-by: Vitaly Kuznetsov <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
| -rw-r--r-- | arch/x86/kvm/hyperv.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index ab8dc23f05bf..cb66842ccb8d 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -1205,6 +1205,18 @@ out_unlock: static bool hv_check_msr_access(struct kvm_vcpu_hv *hv_vcpu, u32 msr) { + if (!hv_vcpu->enforce_cpuid) + return true; + + switch (msr) { + case HV_X64_MSR_GUEST_OS_ID: + case HV_X64_MSR_HYPERCALL: + return hv_vcpu->cpuid_cache.features_eax & + HV_MSR_HYPERCALL_AVAILABLE; + default: + break; + } + return true; } |