diff options
| -rw-r--r-- | fs/binfmt_elf.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index cc72bb43061d..b2efbaead6c3 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -856,7 +856,13 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 856 | * default mmap base, as well as whatever program they | 856 | * default mmap base, as well as whatever program they |
| 857 | * might try to exec. This is because the brk will | 857 | * might try to exec. This is because the brk will |
| 858 | * follow the loader, and is not movable. */ | 858 | * follow the loader, and is not movable. */ |
| 859 | load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); | 859 | if (current->flags & PF_RANDOMIZE) |
| 860 | load_bias = randomize_range(0x10000, | ||
| 861 | ELF_ET_DYN_BASE, | ||
| 862 | 0); | ||
| 863 | else | ||
| 864 | load_bias = ELF_ET_DYN_BASE; | ||
| 865 | load_bias = ELF_PAGESTART(load_bias - vaddr); | ||
| 860 | } | 866 | } |
| 861 | 867 | ||
| 862 | error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, | 868 | error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, |