Skip to content

Commit 5417a2e

Browse files
author
Marc Zyngier
committed
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: 4f128f8 ("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>
1 parent 32392e0 commit 5417a2e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

arch/arm64/kvm/nested.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,27 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu)
6767
if (!tmp)
6868
return -ENOMEM;
6969

70+
swap(kvm->arch.nested_mmus, tmp);
71+
7072
/*
7173
* If we went through a realocation, adjust the MMU back-pointers in
7274
* the previously initialised kvm_pgtable structures.
7375
*/
7476
if (kvm->arch.nested_mmus != tmp)
7577
for (int i = 0; i < kvm->arch.nested_mmus_size; i++)
76-
tmp[i].pgt->mmu = &tmp[i];
78+
kvm->arch.nested_mmus[i].pgt->mmu = &kvm->arch.nested_mmus[i];
7779

7880
for (int i = kvm->arch.nested_mmus_size; !ret && i < num_mmus; i++)
79-
ret = init_nested_s2_mmu(kvm, &tmp[i]);
81+
ret = init_nested_s2_mmu(kvm, &kvm->arch.nested_mmus[i]);
8082

8183
if (ret) {
8284
for (int i = kvm->arch.nested_mmus_size; i < num_mmus; i++)
83-
kvm_free_stage2_pgd(&tmp[i]);
85+
kvm_free_stage2_pgd(&kvm->arch.nested_mmus[i]);
8486

8587
return ret;
8688
}
8789

8890
kvm->arch.nested_mmus_size = num_mmus;
89-
kvm->arch.nested_mmus = tmp;
9091

9192
return 0;
9293
}

0 commit comments

Comments
 (0)