arm64: vgic-v2: Fix guest endianness check in hVHE mode

Fuad Tabba · oupton · commit f1edb159200a · 2025-08-08T01:29:32.000-07:00
In hVHE when running at the hypervisor, SCTLR_EL1 refers to the hypervisor's System Control Register rather than the guest's. Make sure to access the guest's register to determine its endianness. Reported-by: Will Deacon <will@kernel.org> Signed-off-by: Fuad Tabba <tabba@google.com> Link: https://lore.kernel.org/r/20250807120133.871892-4-tabba@google.com Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
diff --git a/arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c b/arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c
@@ -20,7 +20,7 @@ static bool __is_be(struct kvm_vcpu *vcpu)
 	if (vcpu_mode_is_32bit(vcpu))
 		return !!(read_sysreg_el2(SYS_SPSR) & PSR_AA32_E_BIT);
 
-	return !!(read_sysreg(SCTLR_EL1) & SCTLR_ELx_EE);
+	return !!(read_sysreg_el1(SYS_SCTLR) & SCTLR_ELx_EE);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static bool __is_be(struct kvm_vcpu *vcpu)`
`20`	`20`	`if (vcpu_mode_is_32bit(vcpu))`
`21`	`21`	`return !!(read_sysreg_el2(SYS_SPSR) & PSR_AA32_E_BIT);`
`22`	`22`
`23`		`- return !!(read_sysreg(SCTLR_EL1) & SCTLR_ELx_EE);`
	`23`	`+ return !!(read_sysreg_el1(SYS_SCTLR) & SCTLR_ELx_EE);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/*`