KVM: x86: use array_index_nospec with indices that come from guest

commit c87bd4dd43a624109c3cc42d843138378a7f4548 upstream.

min and dest_id are guest-controlled indices. Using array_index_nospec()
after the bounds checks clamps these values to mitigate speculative execution
side-channels.

Signed-off-by: Thijs Raymakers <thijs@raymakers.nl>
Cc: stable@vger.kernel.org
Cc: Sean Christopherson <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Fixes: 715062970f37 ("KVM: X86: Implement PV sched yield hypercall")
Fixes: bdf7ffc89922 ("KVM: LAPIC: Fix pv ipis out-of-bounds access")
Fixes: 4180bf1b655a ("KVM: X86: Implement "send IPI" hypercall")
Link: https://lore.kernel.org/r/20250804064405.4802-1-thijs@raymakers.nl
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 319ed873a11116e703104cfb35064e60c5c935ca..257fba652aa564d429b3ec0099dff04a5574fd9c 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -589,6 +589,9 @@ int kvm_pv_send_ipi(struct kvm *kvm, unsigned long ipi_bitmap_low,
 
        if (min > map->max_apic_id)
                goto out;
+
+       min = array_index_nospec(min, map->max_apic_id + 1);
+
        /* Bits above cluster_size are masked in the caller.  */
        for_each_set_bit(i, &ipi_bitmap_low,
                min((u32)BITS_PER_LONG, (map->max_apic_id - min + 1))) {

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 07154cae7a153e3643ef0423a1f54fafc7bcc522..b50d0da06b5991b4447ad9330871a388bc56f3e2 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7506,8 +7506,11 @@ static void kvm_sched_yield(struct kvm *kvm, unsigned long dest_id)
        rcu_read_lock();
        map = rcu_dereference(kvm->arch.apic_map);
 
-       if (likely(map) && dest_id <= map->max_apic_id && map->phys_map[dest_id])
-               target = map->phys_map[dest_id]->vcpu;
+       if (likely(map) && dest_id <= map->max_apic_id) {
+               dest_id = array_index_nospec(dest_id, map->max_apic_id + 1);
+               if (map->phys_map[dest_id])
+                       target = map->phys_map[dest_id]->vcpu;
+       }
 
        rcu_read_unlock();