diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-03-13 11:19:09 +0100 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-03-13 12:15:45 +0100 |
commit | e143fa93c28669a7f0851e6850b1da5b1945fd53 (patch) | |
tree | 3666450af8b0e344439215271ad981767ae69040 /arch | |
parent | s390/ftrace: fix compile error if CONFIG_KPROBES is disabled (diff) | |
download | linux-e143fa93c28669a7f0851e6850b1da5b1945fd53.tar.xz linux-e143fa93c28669a7f0851e6850b1da5b1945fd53.zip |
s390/mm: limit STACK_RND_MASK for compat tasks
For compat tasks the mmap randomization does not use the maximum
randomization value from mmap_rnd_mask but the fixed value of 0x7ff.
This needs to be respected in the definition of STACK_RND_MASK as
well.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/include/asm/elf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h index c9df40b5c0ac..c9c875d9ed31 100644 --- a/arch/s390/include/asm/elf.h +++ b/arch/s390/include/asm/elf.h @@ -211,7 +211,7 @@ do { \ extern unsigned long mmap_rnd_mask; -#define STACK_RND_MASK (mmap_rnd_mask) +#define STACK_RND_MASK (test_thread_flag(TIF_31BIT) ? 0x7ff : mmap_rnd_mask) #define ARCH_DLINFO \ do { \ |