Commit e913c7ce authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Fix Trace Buffer trap polarity for protected VMs 



The E2TB bits in MDCR_EL2 control trapping of Trace Buffer system
register accesses. These accesses are trapped to EL2 when the bits are
clear.

The trap initialization logic for protected VMs in pvm_init_traps_mdcr()
had the polarity inverted. When a guest did not support the Trace Buffer
feature, the code was setting E2TB. This incorrectly disabled the trap,
potentially allowing a protected guest to access registers for a feature
it was not given.

Fix this by inverting the operation.

Fixes: f5075826 ("KVM: arm64: Group setting traps for protected VMs by control register")
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://patch.msgid.link/20251211104710.151771-3-tabba@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 288eb554

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void pvm_init_traps_mdcr(struct kvm_vcpu *vcpu) 
		val |= MDCR_EL2_TTRF;



	if (!kvm_has_feat(kvm, ID_AA64DFR0_EL1, TraceBuffer, IMP))

		val |= MDCR_EL2_E2TB_MASK;

		val &= ~MDCR_EL2_E2TB_MASK;



	/* Trap Debug Communications Channel registers */

	if (!kvm_has_feat(kvm, ID_AA64MMFR0_EL1, FGT, IMP))