]> www.infradead.org Git - users/dwmw2/linux.git/commit
KVM: arm64: Fix nested S2 MMU structures reallocation
authorMarc Zyngier <maz@kernel.org>
Tue, 4 Feb 2025 14:55:54 +0000 (14:55 +0000)
committerMarc Zyngier <maz@kernel.org>
Tue, 4 Feb 2025 15:02:16 +0000 (15:02 +0000)
commit5417a2e9b130a78bf48cb4cf92630efcee5ccf38
tree351dd23461017e71e6d0cf0ee58cf9d082c8136a
parent32392e04cb50d87bb7a6a7d9213f44a1a0961820
KVM: arm64: Fix nested S2 MMU structures reallocation

For each vcpu that userspace creates, we allocate a number of
s2_mmu structures that will eventually contain our shadow S2
page tables.

Since this is a dynamically allocated array, we reallocate
the array and initialise the newly allocated elements. Once
everything is correctly initialised, we adjust pointer and size
in the kvm structure, and move on.

But should that initialisation fail *and* the reallocation triggered
a copy to another location, we end-up returning early, with the
kvm structure still containing the (now stale) old pointer. Weeee!

Cure it by assigning the pointer early, and use this to perform
the initialisation. If everything succeeds, we adjust the size.
Otherwise, we just leave the size as it was, no harm done, and the
new memory is as good as the ol' one (we hope...).

Fixes: 4f128f8e1aaac ("KVM: arm64: nv: Support multiple nested Stage-2 mmu structures")
Reported-by: Alexander Potapenko <glider@google.com>
Tested-by: Alexander Potapenko <glider@google.com>
Link: https://lore.kernel.org/r/20250204145554.774427-1-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/nested.c