git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
fs
/
binfmt_elf.c
diff --git
a/fs/binfmt_elf.c
b/fs/binfmt_elf.c
index
093645b
..
479ee5f
100644
(file)
--- a/
fs/binfmt_elf.c
+++ b/
fs/binfmt_elf.c
@@
-88,7
+88,7
@@
static struct linux_binfmt elf_format = {
.min_coredump = ELF_EXEC_PAGESIZE
};
.min_coredump = ELF_EXEC_PAGESIZE
};
-#define BAD_ADDR(x) ((unsigned long)(x) > PAGE_MASK)
+#define BAD_ADDR(x) ((unsigned long)(x) >
=
PAGE_MASK)
static int set_brk(unsigned long start, unsigned long end)
{
static int set_brk(unsigned long start, unsigned long end)
{
@@
-441,7
+441,7
@@
static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,
* <= p_memsize so it is only necessary to check p_memsz.
*/
k = load_addr + eppnt->p_vaddr;
* <= p_memsize so it is only necessary to check p_memsz.
*/
k = load_addr + eppnt->p_vaddr;
- if (
k > TASK_SIZE
|| eppnt->p_filesz > eppnt->p_memsz ||
+ if (
BAD_ADDR(k)
|| eppnt->p_filesz > eppnt->p_memsz ||
eppnt->p_memsz > TASK_SIZE || TASK_SIZE - eppnt->p_memsz < k) {
error = -ENOMEM;
goto out_close;
eppnt->p_memsz > TASK_SIZE || TASK_SIZE - eppnt->p_memsz < k) {
error = -ENOMEM;
goto out_close;
@@
-944,7
+944,7
@@
static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)
* allowed task size. Note that p_filesz must always be
* <= p_memsz so it is only necessary to check p_memsz.
*/
* allowed task size. Note that p_filesz must always be
* <= p_memsz so it is only necessary to check p_memsz.
*/
- if (
k > TASK_SIZE
|| elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
+ if (
BAD_ADDR(k)
|| elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
elf_ppnt->p_memsz > TASK_SIZE ||
TASK_SIZE - elf_ppnt->p_memsz < k) {
/* set_brk can never work. Avoid overflows. */
elf_ppnt->p_memsz > TASK_SIZE ||
TASK_SIZE - elf_ppnt->p_memsz < k) {
/* set_brk can never work. Avoid overflows. */
@@
-1005,10
+1005,9
@@
static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)
}
}
if (BAD_ADDR(elf_entry)) {
}
}
if (BAD_ADDR(elf_entry)) {
- printk(KERN_ERR "Unable to load interpreter %.128s\n",
- elf_interpreter);
force_sig(SIGSEGV, current);
force_sig(SIGSEGV, current);
- retval = -ENOEXEC; /* Nobody gets to see this, but.. */
+ retval = IS_ERR((void *)elf_entry) ?
+ (int)elf_entry : -EINVAL;
goto out_free_dentry;
}
reloc_func_desc = interp_load_addr;
goto out_free_dentry;
}
reloc_func_desc = interp_load_addr;
@@
-1019,8
+1018,8
@@
static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)
} else {
elf_entry = loc->elf_ex.e_entry;
if (BAD_ADDR(elf_entry)) {
} else {
elf_entry = loc->elf_ex.e_entry;
if (BAD_ADDR(elf_entry)) {
-
send_sig(SIGSEGV, current, 0
);
- retval = -E
NOEXEC; /* Nobody gets to see this, but.. */
+
force_sig(SIGSEGV, current
);
+ retval = -E
INVAL;
goto out_free_dentry;
}
}
goto out_free_dentry;
}
}