target/arm: fix LORID_EL1 access check
PATCH 1/1 target/arm: fix LORID_EL1 access check
From: Rémi Denis-Courmont <[email protected]>
Secure mode is not exempted from checking SCR_EL3.TLOR, and in the future HCR_EL2.TLOR when S-EL2 is enabled.
Signed-off-by Rémi Denis-Courmont <[email protected]>
--- target/arm/helper.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
target/arm/helper.c +5 -14
@@ -6679,9 +6679,10 @@ static uint64_t id_aa64pfr0_read(CPUARMState *env, const ARMCPRegInfo *ri)#endif /* Shared logic between LORID and the rest of the LOR* registers. -* Secure state has already been delt with. +* Secure state exclusion has already been dealt with. */ -static CPAccessResult access_lor_ns (CPUARMState *env) +static CPAccessResult access_lor_ns (CPUARMState *env, +const ARMCPRegInfo *ri,bool isread) {int el =arm_current_el (env);
@@ -6694,16 +6695,6 @@ static CPAccessResult access_lor_ns(CPUARMState *env)return CP_ACCESS_OK ; } -static CPAccessResult access_lorid (CPUARMState *env,const ARMCPRegInfo *ri, -bool isread) -{ -if (arm_is_secure_below_el3 (env)) { -/* Access ok in secure mode. */ -return CP_ACCESS_OK ; - } -return access_lor_ns (env); -} -static CPAccessResult access_lor_other (CPUARMState *env,const ARMCPRegInfo *ri,bool isread) {
@@ -6711,7 +6702,7 @@ static CPAccessResult access_lor_other(CPUARMState *env,/* Access denied in secure mode. */ return CP_ACCESS_TRAP ; } -return access_lor_ns (env); +return access_lor_ns (env, ri, isread); }/*
@@ -6738,7 +6729,7 @@ static const ARMCPRegInfo lor_reginfo[] = { .type = ARM_CP_CONST, .resetvalue = 0 }, { .name = "LORID_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 10, .crm = 4, .opc2 = 7, - .access = PL1_R, .accessfn = access_lorid, + .access = PL1_R, .accessfn = access_lor_ns, .type = ARM_CP_CONST, .resetvalue = 0 }, REGINFO_SENTINEL };
Signature · 1 line
2.29.1
Woops sorry for the dup.
(If there are any mails from me in the approval queue, admin is welcome to discard them.)
Signature · 2 lines
Rémi Denis-Courmont http://www.remlab.net/
Peter Maydell
AppliedQuoted 7 lines · On Thu, 29 Oct 2020 at 20:25, <[email protected]> wrote:
From: Rémi Denis-Courmont <[email protected]>
Secure mode is not exempted from checking SCR_EL3.TLOR, and in the future HCR_EL2.TLOR when S-EL2 is enabled.
Signed-off-by Rémi Denis-Courmont <[email protected]>
Applied to target-arm.next, thanks.
-- PMM