Commit db155131 authored by Marios Pomonis's avatar Marios Pomonis Committed by Greg Kroah-Hartman

KVM: x86: Protect DR-based index computations from Spectre-v1/L1TF attacks

commit ea740059 upstream.

This fixes a Spectre-v1/L1TF vulnerability in __kvm_set_dr() and
kvm_get_dr().
Both kvm_get_dr() and kvm_set_dr() (a wrapper of __kvm_set_dr()) are
exported symbols so KVM should tream them conservatively from a security
perspective.

Fixes: 020df079 ("KVM: move DR register access handling into generic code")
Signed-off-by: default avatarNick Finco <nifi@google.com>
Signed-off-by: default avatarMarios Pomonis <pomonis@google.com>
Reviewed-by: default avatarAndrew Honig <ahonig@google.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eef3ed3f
...@@ -961,9 +961,11 @@ static u64 kvm_dr6_fixed(struct kvm_vcpu *vcpu) ...@@ -961,9 +961,11 @@ static u64 kvm_dr6_fixed(struct kvm_vcpu *vcpu)
static int __kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val) static int __kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val)
{ {
size_t size = ARRAY_SIZE(vcpu->arch.db);
switch (dr) { switch (dr) {
case 0 ... 3: case 0 ... 3:
vcpu->arch.db[dr] = val; vcpu->arch.db[array_index_nospec(dr, size)] = val;
if (!(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP)) if (!(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP))
vcpu->arch.eff_db[dr] = val; vcpu->arch.eff_db[dr] = val;
break; break;
...@@ -1000,9 +1002,11 @@ EXPORT_SYMBOL_GPL(kvm_set_dr); ...@@ -1000,9 +1002,11 @@ EXPORT_SYMBOL_GPL(kvm_set_dr);
int kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val) int kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val)
{ {
size_t size = ARRAY_SIZE(vcpu->arch.db);
switch (dr) { switch (dr) {
case 0 ... 3: case 0 ... 3:
*val = vcpu->arch.db[dr]; *val = vcpu->arch.db[array_index_nospec(dr, size)];
break; break;
case 4: case 4:
/* fall through */ /* fall through */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment