[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1549562945-5503-3-git-send-email-pbonzini@redhat.com>
Date: Thu, 7 Feb 2019 19:09:05 +0100
From: Paolo Bonzini <pbonzini@...hat.com>
To: linux-kernel@...r.kernel.org, kvm@...r.kernel.org
Cc: Peter Shier <pshier@...gle.com>, stable@...nel.org
Subject: [PATCH] KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
From: Peter Shier <pshier@...gle.com>
Bugzilla: 1671904
There are multiple code paths where an hrtimer may have been started to
emulate an L1 VMX preemption timer that can result in a call to free_nested
without an intervening L2 exit where the hrtimer is normally
cancelled. Unconditionally cancel in free_nested to cover all cases.
Embargoed until Feb 7th 2019.
Signed-off-by: Peter Shier <pshier@...gle.com>
Reported-by: Jim Mattson <jmattson@...gle.com>
Reviewed-by: Jim Mattson <jmattson@...gle.com>
Reported-by: Felix Wilhelm <fwilhelm@...gle.com>
Cc: stable@...nel.org
Message-Id: <20181011184646.154065-1-pshier@...gle.com>
Signed-off-by: Paolo Bonzini <pbonzini@...hat.com>
---
arch/x86/kvm/vmx/nested.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 8ff20523661b..d8ea4ebd79e7 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -211,6 +211,7 @@ static void free_nested(struct kvm_vcpu *vcpu)
if (!vmx->nested.vmxon && !vmx->nested.smm.vmxon)
return;
+ hrtimer_cancel(&vmx->nested.preemption_timer);
vmx->nested.vmxon = false;
vmx->nested.smm.vmxon = false;
free_vpid(vmx->nested.vpid02);
--
1.8.3.1
Powered by blists - more mailing lists