diff options
author | Michal Hocko <mhocko@suse.com> | 2016-05-23 19:25:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 20:04:14 -0400 |
commit | ecc2bc8ac03884266cf73f8a2a42b911465b2fbc (patch) | |
tree | 9a9edd23784c51e8863c0259900a62bce07ad765 | |
parent | 864778b154233d3a673c520aa9606777589ecee7 (diff) |
mm, elf: handle vm_brk error
load_elf_library doesn't handle vm_brk failure although nothing really
indicates it cannot do that because the function is allowed to fail due
to vm_mmap failures already. This might be not a problem now but later
patch will make vm_brk killable (resp. mmap_sem for write waiting will
become killable) and so the failure will be more probable.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/binfmt_elf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 56224ffa94d2..938fc4ede764 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
@@ -1176,8 +1176,11 @@ static int load_elf_library(struct file *file) | |||
1176 | len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + | 1176 | len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + |
1177 | ELF_MIN_ALIGN - 1); | 1177 | ELF_MIN_ALIGN - 1); |
1178 | bss = eppnt->p_memsz + eppnt->p_vaddr; | 1178 | bss = eppnt->p_memsz + eppnt->p_vaddr; |
1179 | if (bss > len) | 1179 | if (bss > len) { |
1180 | vm_brk(len, bss - len); | 1180 | error = vm_brk(len, bss - len); |
1181 | if (BAD_ADDR(error)) | ||
1182 | goto out_free_ph; | ||
1183 | } | ||
1181 | error = 0; | 1184 | error = 0; |
1182 | 1185 | ||
1183 | out_free_ph: | 1186 | out_free_ph: |