]> git.hungrycats.org Git - linux/commitdiff
KVM: x86: Take SRCU in kvm_zap_gfn_range()
authorChengfeng Ye <nicoyip.dev@gmail.com>
Tue, 25 Aug 2026 18:39:24 +0000 (02:39 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:09 +0000 (12:06 -0500)
commit b59a87c1ba3c347e8aec5f932eb7abf13064fd62 upstream.

kvm_zap_gfn_range() walks memslots and rmaps and may drop mmu_lock to
reschedule. Callers that do not already hold kvm->srcu (or slots_lock)
can race with memslot deletion: synchronize_srcu_expedited() does not
wait, kvm_free_memslot() frees the old slot and its rmap, and the zap
resumes on freed memory.

The VFIO noncoherent-DMA path hits this by zapping the entire GPA
space without SRCU. KASAN reported:

  BUG: KASAN: vmalloc-out-of-bounds in slot_rmap_walk_next+0x82/0x1c0
  Read of size 8 at addr ffffc900005c1008
  Call Trace:
   slot_rmap_walk_next+0x82/0x1c0
   __kvm_rmap_zap_gfn_range+0x17a/0x280
   kvm_zap_gfn_range+0x2a6/0x6a0
   kvm_vfio_set_attr+0x576/0x770
   kvm_device_ioctl+0x1ff/0x3b0

Take SRCU inside kvm_zap_gfn_range() so every caller is covered.
Nesting with an existing kvm->srcu critical section is fine; the
helper uses a local index. Drop the now-redundant SRCU pair from
__kvm_set_or_clear_apicv_inhibit().

Fixes: 362ff6dca541 ("KVM: x86/mmu: Zap KVM TDP when noncoherent DMA assignment starts/stops")
Cc: stable@vger.kernel.org
Signed-off-by: Chengfeng Ye <nicoyip.dev@gmail.com>
Reviewed-by: Kai Huang <kai.huang@intel.com>
Link: https://patch.msgid.link/20260825183924.237727-1-nicoyip.dev@gmail.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/mmu/mmu.c
arch/x86/kvm/x86.c

index 551d707a4f27bb0c315c098bddbb0b4924ed6e6f..24f22c10e6774d1f931fe8a8147b9863a62bc8c5 100644 (file)
@@ -6876,6 +6876,8 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end)
        if (WARN_ON_ONCE(gfn_end <= gfn_start))
                return;
 
+       guard(srcu)(&kvm->srcu);
+
        write_lock(&kvm->mmu_lock);
 
        kvm_mmu_invalidate_begin(kvm);
index 72f63324643ad3ef686ee3f06423cd0101a57359..6576c692a94eb6903c6dc1a0d419ee6094d09423 100644 (file)
@@ -10619,10 +10619,8 @@ void __kvm_set_or_clear_apicv_inhibit(struct kvm *kvm,
                kvm->arch.apicv_inhibit_reasons = new;
                if (new) {
                        unsigned long gfn = gpa_to_gfn(APIC_DEFAULT_PHYS_BASE);
-                       int idx = srcu_read_lock(&kvm->srcu);
 
                        kvm_zap_gfn_range(kvm, gfn, gfn+1);
-                       srcu_read_unlock(&kvm->srcu, idx);
                }
        } else {
                kvm->arch.apicv_inhibit_reasons = new;