Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9586a2ea authored by Shannon Zhao's avatar Shannon Zhao Committed by Marc Zyngier
Browse files

arm64: KVM: Fix wrong use of the CPSR MODE mask for 32bit guests 



The values of CPSR MODE mask are different between aarch32 and aarch64.
It should use the right one according to the execution state.

Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent a7e0ac29

arch/arm64/include/asm/kvm_emulate.h

+6 −2
Original line number Diff line number Diff line
@@ -127,10 +127,14 @@ static inline unsigned long *vcpu_spsr(const struct kvm_vcpu *vcpu) 


static inline bool vcpu_mode_priv(const struct kvm_vcpu *vcpu)

{

	u32 mode = *vcpu_cpsr(vcpu) & PSR_MODE_MASK;

	u32 mode;



	if (vcpu_mode_is_32bit(vcpu))

	if (vcpu_mode_is_32bit(vcpu)) {

		mode = *vcpu_cpsr(vcpu) & COMPAT_PSR_MODE_MASK;

		return mode > COMPAT_PSR_MODE_USR;

	}



	mode = *vcpu_cpsr(vcpu) & PSR_MODE_MASK;



	return mode != PSR_MODE_EL0t;

}