Use the "ibrs_inuse" variable.

Orabug: 27344012
CVE: CVE-2017-5715

Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: John Haxby <john.haxby@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index f76181493fd45e29f060ce0985771e4961e5e7f1..a9b04baf01b3271237b5c4348c592085f84a06e0 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -3930,7 +3930,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
 
        local_irq_enable();
 
-       if (static_cpu_has(X86_FEATURE_SPEC_CTRL) &&
+       if (ibrs_inuse &&
            svm->spec_ctrl != FEATURE_ENABLE_IBRS)
                wrmsrl(MSR_IA32_SPEC_CTRL, svm->spec_ctrl);
 
@@ -4026,7 +4026,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
 #endif
                );
 
-       if (static_cpu_has(X86_FEATURE_SPEC_CTRL)) {
+       if (ibrs_inuse) {
                rdmsrl(MSR_IA32_SPEC_CTRL, svm->spec_ctrl);
                if (svm->spec_ctrl != FEATURE_ENABLE_IBRS)
                        wrmsrl(MSR_IA32_SPEC_CTRL, FEATURE_ENABLE_IBRS);