KVM: x86: Mask off reserved bit from #DB exception payload

commit 307f1cfa269657c63cfe2c932386fcc24684d9dd upstream.

KVM defines the #DB payload as compatible with the 'pending debug
exceptions' field under VMX, not DR6. Mask off bit 12 when applying the
payload to DR6, as it is reserved on DR6 but not the 'pending debug
exceptions' field.

Fixes: f10c729ff965 ("kvm: vmx: Defer setting of DR6 until #DB delivery")
Signed-off-by: Oliver Upton <oupton@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index edde5ee8c6f50eeabab499bab93e79b413558fc7..95180d67d5703e651dbcc280a4f063bba647a11d 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -445,6 +445,14 @@ void kvm_deliver_exception_payload(struct kvm_vcpu *vcpu)
                 * for #DB exceptions under VMX.
                 */
                vcpu->arch.dr6 ^= payload & DR6_RTM;
+
+               /*
+                * The #DB payload is defined as compatible with the 'pending
+                * debug exceptions' field under VMX, not DR6. While bit 12 is
+                * defined in the 'pending debug exceptions' field (enabled
+                * breakpoint), it is reserved and must be zero in DR6.
+                */
+               vcpu->arch.dr6 &= ~BIT(12);
                break;
        case PF_VECTOR:
                vcpu->arch.cr2 = payload;