Skip to content

Commit 1c965b1

Browse files
Peter Shiergregkh
Peter Shier
authored andcommitted
KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
commit ecec768 upstream. 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@google.com> Reported-by: Jim Mattson <jmattson@google.com> Reviewed-by: Jim Mattson <jmattson@google.com> Reported-by: Felix Wilhelm <fwilhelm@google.com> Cc: stable@kernel.org Message-Id: <20181011184646.154065-1-pshier@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8c1b11b commit 1c965b1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/kvm/vmx.c

+1
Original file line numberDiff line numberDiff line change
@@ -7708,6 +7708,7 @@ static void free_nested(struct vcpu_vmx *vmx)
77087708
if (!vmx->nested.vmxon)
77097709
return;
77107710

7711+
hrtimer_cancel(&vmx->nested.preemption_timer);
77117712
vmx->nested.vmxon = false;
77127713
free_vpid(vmx->nested.vpid02);
77137714
vmx->nested.posted_intr_nv = -1;

0 commit comments

Comments
 (0)