From b56a0cdeaf91347a2c738dc5dd0350420e0e7201 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 6 Mar 2018 16:24:41 +0100 Subject: [PATCH] x86/HVM: don't give the wrong impression of WRMSR succeeding ... for non-existent MSRs: wrmsr_hypervisor_regs()'s comment clearly says that the function returns 0 for unrecognized MSRs, so {svm,vmx}_msr_write_intercept() should not convert this into success. We don't want to unconditionally fail the access though, as we can't be certain the list of handled MSRs is complete enough for the guest types we care about, so instead mirror what we do on the read paths and probe the MSR to decide whether to raise #GP. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky master commit: 1f1d183d49008794b087cf043fc77f724a45af98 master date: 2018-02-27 15:12:23 +0100 --- xen/arch/x86/hvm/svm/svm.c | 7 +++++++ xen/arch/x86/hvm/vmx/vmx.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e5bc5122e4..fd593fac13 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1965,6 +1965,13 @@ static int svm_msr_write_intercept(unsigned int msr, uint64_t msr_content) result = X86EMUL_RETRY; break; case 0: + /* + * Match up with the RDMSR side for now; ultimately this entire + * case block should go away. + */ + if ( rdmsr_safe(msr, msr_content) == 0 ) + break; + goto gpf; case 1: break; default: diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a4124e4a35..a6a32db1e2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2993,6 +2993,13 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) case -ERESTART: return X86EMUL_RETRY; case 0: + /* + * Match up with the RDMSR side for now; ultimately this + * entire case block should go away. + */ + if ( rdmsr_safe(msr, msr_content) == 0 ) + break; + goto gp_fault; case 1: break; default: -- 2.39.5