diff options
author | Mark Brown <broonie@kernel.org> | 2018-07-18 13:37:19 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-07-18 13:37:19 +0100 |
commit | faf34726275b225a9954f2901364c053e6e3d1f0 (patch) | |
tree | 3ac169b40a37387cf986331b9371db8b0c5b7af7 /fs/binfmt_elf.c | |
parent | 77c2bedd8f1658a47e015e77ee1f86b619707735 (diff) | |
parent | cff26c95b24c7b7147db17b623dee946bd25ec95 (diff) |
Merge tag 'v4.14.56' into linux-linaro-lsk-v4.14
This is the 4.14.56 stable release
Diffstat (limited to 'fs/binfmt_elf.c')
-rw-r--r-- | fs/binfmt_elf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 73b01e474fdc..c0e3f91e28e9 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1235,9 +1235,8 @@ static int load_elf_library(struct file *file) goto out_free_ph; } - len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + - ELF_MIN_ALIGN - 1); - bss = eppnt->p_memsz + eppnt->p_vaddr; + len = ELF_PAGEALIGN(eppnt->p_filesz + eppnt->p_vaddr); + bss = ELF_PAGEALIGN(eppnt->p_memsz + eppnt->p_vaddr); if (bss > len) { error = vm_brk(len, bss - len); if (error) |