Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'xtensa-20260219' of https://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa update from Max Filippov:
- fix unhandled case in the load/store fault handler
in configurations with MMU
* tag 'xtensa-20260219' of https://github.com/jcmvbkbc/linux-xtensa:
xtensa: align: validate access in fast_load_store
+8
-2
+8
-2
arch/xtensa/kernel/align.S
+8
-2
arch/xtensa/kernel/align.S
···
21
21
#include <asm/asm-offsets.h>
22
22
#include <asm/asmmacro.h>
23
23
#include <asm/processor.h>
24
+
#ifdef CONFIG_MMU
25
+
#include <asm/asm-uaccess.h>
26
+
#endif
24
27
25
28
#if XCHAL_UNALIGNED_LOAD_EXCEPTION || defined CONFIG_XTENSA_LOAD_STORE
26
29
#define LOAD_EXCEPTION_HANDLER
···
188
185
189
186
#ifdef CONFIG_MMU
190
187
/* l32e can't be used here even when it's available. */
191
-
/* TODO access_ok(a3) could be used here */
192
-
j .Linvalid_instruction
188
+
rsr a6, ps
189
+
bbci.l a6, PS_UM_BIT, 1f # kernel mode
190
+
movi a5, 8
191
+
access_ok a3, a5, a6, a2, .Linvalid_instruction
192
+
1:
193
193
#endif
194
194
l32i a5, a3, 0
195
195
l32i a6, a3, 4