[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/11] target/arm: PSTATE.PAN should not clear exec bits
From: |
Peter Maydell |
Subject: |
[PULL 03/11] target/arm: PSTATE.PAN should not clear exec bits |
Date: |
Mon, 6 Apr 2020 11:11:57 +0100 |
Our implementation of the PSTATE.PAN bit incorrectly cleared all
access permission bits for privileged access to memory which is
user-accessible. It should only affect the privileged read and write
permissions; execute permission is dealt with via XN/PXN instead.
Fixes: 81636b70c226dc27d7ebc8d
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
---
target/arm/helper.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 163c91a1ccd..ed7eb8ab54e 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10025,9 +10025,11 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx
mmu_idx, bool is_aa64,
prot_rw = user_rw;
} else {
if (user_rw && regime_is_pan(env, mmu_idx)) {
- return 0;
+ /* PAN forbids data accesses but doesn't affect insn fetch */
+ prot_rw = 0;
+ } else {
+ prot_rw = simple_ap_to_rw_prot_is_user(ap, false);
}
- prot_rw = simple_ap_to_rw_prot_is_user(ap, false);
}
if (ns && arm_is_secure(env) && (env->cp15.scr_el3 & SCR_SIF)) {
--
2.20.1
- [PULL 00/11] target-arm queue, Peter Maydell, 2020/04/06
- [PULL 02/11] hw/arm/collie: Put StrongARMState* into a CollieMachineState struct, Peter Maydell, 2020/04/06
- [PULL 03/11] target/arm: PSTATE.PAN should not clear exec bits,
Peter Maydell <=
- [PULL 04/11] target/arm: Remove obsolete TODO note from get_phys_addr_lpae(), Peter Maydell, 2020/04/06
- [PULL 05/11] hw/gpio/aspeed_gpio.c: Don't directly include assert.h, Peter Maydell, 2020/04/06
- [PULL 06/11] dump: Fix writing of ELF section, Peter Maydell, 2020/04/06
- [PULL 08/11] dma/xlnx-zdma: Populate DBG0.CMN_BUF_FREE, Peter Maydell, 2020/04/06
- [PULL 09/11] dma/xlnx-zdma: Clear DMA_DONE when halting, Peter Maydell, 2020/04/06
- [PULL 01/11] target/arm: don't expose "ieee_half" via gdbstub, Peter Maydell, 2020/04/06
- [PULL 07/11] dma/xlnx-zdma: Remove comment, Peter Maydell, 2020/04/06
- [PULL 11/11] dma/xlnx-zdma: Reorg to fix CUR_DSCR, Peter Maydell, 2020/04/06
- [PULL 10/11] dma/xlnx-zdma: Advance the descriptor address when stopping, Peter Maydell, 2020/04/06
- Re: [PULL 00/11] target-arm queue, Peter Maydell, 2020/04/06