[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 02/11] target/arm: Check PAGE_WRITE_ORG for MTE writeability
From: |
Richard Henderson |
Subject: |
[PATCH v3 02/11] target/arm: Check PAGE_WRITE_ORG for MTE writeability |
Date: |
Fri, 2 Apr 2021 14:42:08 -0700 |
We can remove PAGE_WRITE when (internally) marking a page
read-only because it contains translated code.
This can be triggered by tests/tcg/aarch64/bti-2, after
having serviced SIGILL trampolines on the stack.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/mte_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c
index 0bbb9ec346..8be17e1b70 100644
--- a/target/arm/mte_helper.c
+++ b/target/arm/mte_helper.c
@@ -83,7 +83,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int
ptr_mmu_idx,
uint8_t *tags;
uintptr_t index;
- if (!(flags & (ptr_access == MMU_DATA_STORE ? PAGE_WRITE : PAGE_READ))) {
+ if (!(flags & (ptr_access == MMU_DATA_STORE ? PAGE_WRITE_ORG :
PAGE_READ))) {
/* SIGSEGV */
arm_cpu_tlb_fill(env_cpu(env), ptr, ptr_size, ptr_access,
ptr_mmu_idx, false, ra);
--
2.25.1
- [PATCH v3 00/11] target/arm mte fixes, Richard Henderson, 2021/04/02
- [PATCH v3 01/11] accel/tcg: Preserve PAGE_ANON when changing page permissions, Richard Henderson, 2021/04/02
- [PATCH v3 02/11] target/arm: Check PAGE_WRITE_ORG for MTE writeability,
Richard Henderson <=
- [PATCH v3 03/11] target/arm: Fix unaligned mte checks for mte_checkN, Richard Henderson, 2021/04/02
- [PATCH v3 04/11] target/arm: Split out mte_probe_int, Richard Henderson, 2021/04/02
- [PATCH v3 05/11] target/arm: Fix unaligned checks for mte_check1, mte_probe1, Richard Henderson, 2021/04/02
- [PATCH v3 06/11] test/tcg/aarch64: Add mte-5, Richard Henderson, 2021/04/02
- [PATCH v3 07/11] target/arm: Replace MTEDESC ESIZE+TSIZE with SIZEM1, Richard Henderson, 2021/04/02
- [PATCH v3 09/11] target/arm: Rename mte_probe1 to mte_probe, Richard Henderson, 2021/04/02
- [PATCH v3 08/11] target/arm: Merge mte_check1, mte_checkN, Richard Henderson, 2021/04/02
- [PATCH v3 10/11] target/arm: Simplify sve mte checking, Richard Henderson, 2021/04/02
- [PATCH v3 11/11] target/arm: Remove log2_esize parameter to gen_mte_checkN, Richard Henderson, 2021/04/02
- Re: [PATCH v3 00/11] target/arm mte fixes, no-reply, 2021/04/02