projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes-4.7' of git://people.freedesktop.org/~agd5f/linux into drm...
[deliverable/linux.git]
/
fs
/
binfmt_elf.c
diff --git
a/fs/binfmt_elf.c
b/fs/binfmt_elf.c
index 938fc4ede764b42c23b217c213ff29d09b22c501..a7a28110dc80aa9df1e700d9c24aa297161ab996 100644
(file)
--- a/
fs/binfmt_elf.c
+++ b/
fs/binfmt_elf.c
@@
-96,10
+96,9
@@
static int set_brk(unsigned long start, unsigned long end)
start = ELF_PAGEALIGN(start);
end = ELF_PAGEALIGN(end);
if (end > start) {
start = ELF_PAGEALIGN(start);
end = ELF_PAGEALIGN(end);
if (end > start) {
- unsigned long addr;
- addr = vm_brk(start, end - start);
- if (BAD_ADDR(addr))
- return addr;
+ int error = vm_brk(start, end - start);
+ if (error)
+ return error;
}
current->mm->start_brk = current->mm->brk = end;
return 0;
}
current->mm->start_brk = current->mm->brk = end;
return 0;
@@
-629,7
+628,7
@@
static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
/* Map the last of the bss segment */
error = vm_brk(elf_bss, last_bss - elf_bss);
/* Map the last of the bss segment */
error = vm_brk(elf_bss, last_bss - elf_bss);
- if (
BAD_ADDR(error)
)
+ if (
error
)
goto out;
}
goto out;
}
@@
-1178,7
+1177,7
@@
static int load_elf_library(struct file *file)
bss = eppnt->p_memsz + eppnt->p_vaddr;
if (bss > len) {
error = vm_brk(len, bss - len);
bss = eppnt->p_memsz + eppnt->p_vaddr;
if (bss > len) {
error = vm_brk(len, bss - len);
- if (
BAD_ADDR(error)
)
+ if (
error
)
goto out_free_ph;
}
error = 0;
goto out_free_ph;
}
error = 0;
@@
-2276,7
+2275,7
@@
static int elf_core_dump(struct coredump_params *cprm)
goto end_coredump;
/* Align to page */
goto end_coredump;
/* Align to page */
- if (!dump_skip(cprm, dataoff - cprm->
file->f_
pos))
+ if (!dump_skip(cprm, dataoff - cprm->pos))
goto end_coredump;
for (i = 0, vma = first_vma(current, gate_vma); vma != NULL;
goto end_coredump;
for (i = 0, vma = first_vma(current, gate_vma); vma != NULL;
This page took
0.042685 seconds
and
5
git commands to generate.