Skip to content

Commit efdab99

Browse files
Wanpeng Lirkrcmar
Wanpeng Li
authored andcommitted
KVM: x86: fix escape of guest dr6 to the host
syzkaller reported: WARNING: CPU: 0 PID: 12927 at arch/x86/kernel/traps.c:780 do_debug+0x222/0x250 CPU: 0 PID: 12927 Comm: syz-executor Tainted: G OE 4.15.0-rc2+ #16 RIP: 0010:do_debug+0x222/0x250 Call Trace: <#DB> debug+0x3e/0x70 RIP: 0010:copy_user_enhanced_fast_string+0x10/0x20 </#DB> _copy_from_user+0x5b/0x90 SyS_timer_create+0x33/0x80 entry_SYSCALL_64_fastpath+0x23/0x9a The testcase sets a watchpoint (with perf_event_open) on a buffer that is passed to timer_create() as the struct sigevent argument. In timer_create(), copy_from_user()'s rep movsb triggers the BP. The testcase also sets the debug registers for the guest. However, KVM only restores host debug registers when the host has active watchpoints, which triggers a race condition when running the testcase with multiple threads. The guest's DR6.BS bit can escape to the host before another thread invokes timer_create(), and do_debug() complains. The fix is to respect do_debug()'s dr6 invariant when leaving KVM. Reported-by: Dmitry Vyukov <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Radim Krčmář <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Dmitry Vyukov <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Signed-off-by: Wanpeng Li <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Signed-off-by: Radim Krčmář <[email protected]>
1 parent f38a7b7 commit efdab99

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/x86/kvm/x86.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2961,6 +2961,12 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
29612961
pagefault_enable();
29622962
kvm_x86_ops->vcpu_put(vcpu);
29632963
vcpu->arch.last_host_tsc = rdtsc();
2964+
/*
2965+
* If userspace has set any breakpoints or watchpoints, dr6 is restored
2966+
* on every vmexit, but if not, we might have a stale dr6 from the
2967+
* guest. do_debug expects dr6 to be cleared after it runs, do the same.
2968+
*/
2969+
set_debugreg(0, 6);
29642970
}
29652971

29662972
static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu,

0 commit comments

Comments
 (0)