diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-06-30 18:03:59 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-06-30 12:00:50 -0700 |
| commit | ffa47aa678cfaa9b88e8a26cfb115b4768325121 (patch) | |
| tree | 0719bef951a1e28762868066d3bd73ac29f80c8b /arch/arm/mm | |
| parent | 1854c19cae0d108637c40f90ee0bb9b7c1adbc0a (diff) | |
| download | linux-stable-ffa47aa678cfaa9b88e8a26cfb115b4768325121.tar.gz linux-stable-ffa47aa678cfaa9b88e8a26cfb115b4768325121.tar.bz2 linux-stable-ffa47aa678cfaa9b88e8a26cfb115b4768325121.zip | |
ARM: Prepare for randomized task_struct
With the new task struct randomization, we can run into a build
failure for certain random seeds, which will place fields beyond
the allow immediate size in the assembly:
arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:803: Error: bad immediate value for offset (4096)
Only two constants in asm-offset.h are affected, and I'm changing
both of them here to work correctly in all configurations.
One more macro has the problem, but is currently unused, so this
removes it instead of adding complexity.
Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[kees: Adjust commit log slightly]
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-macros.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 0d40c285bd86..f944836da8a2 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -25,11 +25,6 @@ ldr \rd, [\rn, #VMA_VM_FLAGS] .endm - .macro tsk_mm, rd, rn - ldr \rd, [\rn, #TI_TASK] - ldr \rd, [\rd, #TSK_ACTIVE_MM] - .endm - /* * act_mm - get current->active_mm */ @@ -37,7 +32,10 @@ bic \rd, sp, #8128 bic \rd, \rd, #63 ldr \rd, [\rd, #TI_TASK] - ldr \rd, [\rd, #TSK_ACTIVE_MM] + .if (TSK_ACTIVE_MM > IMM12_MASK) + add \rd, \rd, #TSK_ACTIVE_MM & ~IMM12_MASK + .endif + ldr \rd, [\rd, #TSK_ACTIVE_MM & IMM12_MASK] .endm /* |