]> git.ipfire.org Git - thirdparty/linux.git/commit
KVM: arm64: Reassign nested_mmus array behind mmu_lock
authorHyunwoo Kim <imv4bel@gmail.com>
Fri, 5 Jun 2026 08:27:01 +0000 (17:27 +0900)
committerMarc Zyngier <maz@kernel.org>
Fri, 5 Jun 2026 10:48:41 +0000 (11:48 +0100)
commit70543358fa08e0f7cebc3447c3b70fe97ad7aaa8
tree00e28d99df41621ec3c5933b89c46b1eb68be059
parentcbaffe843a942c0d3102e0f9bce0e72b029b2594
KVM: arm64: Reassign nested_mmus array behind mmu_lock

kvm->arch.nested_mmus[] is walked under kvm->mmu_lock, including from the
MMU notifier path (kvm_unmap_gfn_range() -> kvm_nested_s2_unmap()), which
can run at any time. kvm_vcpu_init_nested() reallocates the array and frees
the old buffer while holding only kvm->arch.config_lock, so such a walker
can reference the freed array.

Allocate the new array outside of mmu_lock, as the allocation can sleep.
Under the lock, copy the existing entries, fix up the back pointers and
reassign the array. Free the old buffer after dropping the lock, as
kvfree() can sleep as well.

Fixes: 4f128f8e1aaac ("KVM: arm64: nv: Support multiple nested Stage-2 mmu structures")
Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com>
Reviewed-by: Oliver Upton <oupton@kernel.org>
Link: https://patch.msgid.link/aiKIVVeIr1aAB1yp@v4bel
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: stable@vger,kernel.org
arch/arm64/kvm/nested.c