KVM: arm64: Fix __pkvm_init_vm error path

Browse source

In the unlikely case where insert_vm_table_entry fails, __pkvm_init_vm
release the memory donated by the host for the PGD, but as the stage-2
is still set-up the hypervisor keeps a refcount on those pages,
effectively leaking the references.

Fix the rollback with the newly added kvm_guest_destroy_stage2().

Fixes: 256b4668cd ("KVM: arm64: Introduce separate hypercalls for pKVM VM reservation and initialization")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Reviewed-by: Fuad Tabba <tabba@google.com>
Tested-by: Fuad Tabba <tabba@google.com>
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Link: https://patch.msgid.link/20260521143626.1005660-3-vdonnefort@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

...

This commit is contained in:

Vincent Donnefort 2026-05-21 15:36:25 +01:00 • committed by Marc Zyngier

parent 6835fbed39

commit 20d2753295

3 changed files with 13 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm64/kvm/hyp/include/nvhe/mem_protect.h

View file

13

arch/arm64/kvm/hyp/nvhe/mem_protect.c

View file

4

arch/arm64/kvm/hyp/nvhe/pkvm.c

View file