]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
KVM: arm64: Don't free hyp pages with pKVM on GICv2
authorQuentin Perret <qperret@google.com>
Thu, 26 Jun 2025 10:10:14 +0000 (10:10 +0000)
committerMarc Zyngier <maz@kernel.org>
Thu, 26 Jun 2025 10:39:15 +0000 (11:39 +0100)
commit0e02219f9cf4f0c0aa3dbf3c820e6612bf3f0c8c
treed26ba91ab78e437149210663d9dffaed40c99d70
parent9a2b9416fd1d18d97ce1b737a11fcbc521140e5d
KVM: arm64: Don't free hyp pages with pKVM on GICv2

Marc reported that enabling protected mode on a device with GICv2
doesn't fail gracefully as one would expect, and leads to a host
kernel crash.

As it turns out, the first half of pKVM init happens before the vgic
probe, and so by the time we find out we have a GICv2 we're already
committed to keeping the pKVM vectors installed at EL2 -- pKVM rejects
stub HVCs for obvious security reasons. However, the error path on KVM
init leads to teardown_hyp_mode() which unconditionally frees hypervisor
allocations (including the EL2 stacks and per-cpu pages) under the
assumption that a previous cpu_hyp_uninit() execution has reset the
vectors back to the stubs, which is false with pKVM.

Interestingly, host stage-2 protection is not enabled yet at this point,
so this use-after-free may go unnoticed for a while. The issue becomes
more obvious after the finalize_pkvm() call.

Fix this by keeping track of the CPUs on which pKVM is initialized in
the kvm_hyp_initialized per-cpu variable, and use it from
teardown_hyp_mode() to skip freeing pages that are in fact used.

Fixes: a770ee80e662 ("KVM: arm64: pkvm: Disable GICv2 support")
Reported-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Quentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20250626101014.1519345-1-qperret@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/arm.c