---

yaml --- r: 54737 b: refs/heads/master c: b140f25 h: refs/heads/master i: 54735: 0877657 v: v3
git-mirror · May 8, 2007 · d06c038 · d06c038
1 parent 129862e
commit d06c038
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce0be1273d1473a5a7b57bf0b4995b40c22d6b54
+refs/heads/master: b140f25108a8b11aa4903014814988549838b324
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
@@ -871,6 +871,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 				elf_prot, elf_flags);
 		if (BAD_ADDR(error)) {
 			send_sig(SIGKILL, current, 0);
+			retval = IS_ERR((void *)error) ?
+				PTR_ERR((void*)error) : -EINVAL;
 			goto out_free_dentry;
 		}
 
@@ -900,6 +902,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 		    TASK_SIZE - elf_ppnt->p_memsz < k) {
 			/* set_brk can never work. Avoid overflows. */
 			send_sig(SIGKILL, current, 0);
+			retval = -EINVAL;
 			goto out_free_dentry;
 		}