diff options
| author | Ricky Ringler <richard.rringler@gmail.com> | 2025-12-15 08:33:23 -0600 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2025-12-15 06:55:40 -0800 |
| commit | 0d4b3ca115b5436d7e68453527566db3e87ab7f0 (patch) | |
| tree | f3fa8bc243dd9da604a1832f18e2dae11c945ec9 /arch | |
| parent | 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 (diff) | |
xtensa: align: validate access in fast_load_store
access_ok() is used only in user mode and
branches to .Linvalid_instruction on fault.
Kernel mode skips access_ok().
Tested-by: Ricky Ringler <richard.rringler@gmail.com>
Signed-off-by: Ricky Ringler <richard.rringler@gmail.com>
Message-ID: <20251215143323.2771889-1-richard.rringler@gmail.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/kernel/align.S | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S index ee97edce2300..f2d0d831ce43 100644 --- a/arch/xtensa/kernel/align.S +++ b/arch/xtensa/kernel/align.S @@ -21,6 +21,9 @@ #include <asm/asm-offsets.h> #include <asm/asmmacro.h> #include <asm/processor.h> +#ifdef CONFIG_MMU +#include <asm/asm-uaccess.h> +#endif #if XCHAL_UNALIGNED_LOAD_EXCEPTION || defined CONFIG_XTENSA_LOAD_STORE #define LOAD_EXCEPTION_HANDLER @@ -185,8 +188,11 @@ ENTRY(fast_load_store) #ifdef CONFIG_MMU /* l32e can't be used here even when it's available. */ - /* TODO access_ok(a3) could be used here */ - j .Linvalid_instruction + rsr a6, ps + bbci.l a6, PS_UM_BIT, 1f # kernel mode + movi a5, 8 + access_ok a3, a5, a6, a2, .Linvalid_instruction +1: #endif l32i a5, a3, 0 l32i a6, a3, 4 |