Commit d19c541d authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: Correctly populate FAR_EL2 on nested SEA injection 



vcpu_write_sys_reg()'s signature is not totally obvious, and it
is rather easy to write something that looks correct, except that...
Oh wait...

Swap addr and FAR_EL2 to restore some sanity in the nested SEA
department.

Fixes: 9aba641b ("KVM: arm64: nv: Respect exception routing rules for SEAs")
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250813163747.2591317-1-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 85acc29f

arch/arm64/kvm/emulate-nested.c

+1 −1
Original line number Diff line number Diff line
@@ -2833,7 +2833,7 @@ int kvm_inject_nested_sea(struct kvm_vcpu *vcpu, bool iabt, u64 addr) 
			     iabt ? ESR_ELx_EC_IABT_LOW : ESR_ELx_EC_DABT_LOW);

	esr |= ESR_ELx_FSC_EXTABT | ESR_ELx_IL;



	vcpu_write_sys_reg(vcpu, FAR_EL2, addr);

	vcpu_write_sys_reg(vcpu, addr, FAR_EL2);



	if (__vcpu_sys_reg(vcpu, SCTLR2_EL2) & SCTLR2_EL1_EASE)

		return kvm_inject_nested(vcpu, esr, except_type_serror);