target/arm: check TGE and E2H flags for EL0 pauth traps
According to ARM ARM we should only trap from the EL1&0 regime. Tested-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20200206105448.4726-35-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
c2ddb7cf96
commit
a7469a3c1e
|
@ -371,7 +371,10 @@ static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra)
|
||||||
if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
|
if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
|
||||||
uint64_t hcr = arm_hcr_el2_eff(env);
|
uint64_t hcr = arm_hcr_el2_eff(env);
|
||||||
bool trap = !(hcr & HCR_API);
|
bool trap = !(hcr & HCR_API);
|
||||||
/* FIXME: ARMv8.1-VHE: trap only applies to EL1&0 regime. */
|
if (el == 0) {
|
||||||
|
/* Trap only applies to EL1&0 regime. */
|
||||||
|
trap &= (hcr & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE);
|
||||||
|
}
|
||||||
/* FIXME: ARMv8.3-NV: HCR_NV trap takes precedence for ERETA[AB]. */
|
/* FIXME: ARMv8.3-NV: HCR_NV trap takes precedence for ERETA[AB]. */
|
||||||
if (trap) {
|
if (trap) {
|
||||||
pauth_trap(env, 2, ra);
|
pauth_trap(env, 2, ra);
|
||||||
|
|
Loading…
Reference in a new issue