---

yaml --- r: 9807 b: refs/heads/master c: 6de5051 h: refs/heads/master i: 9805: 37787ea 9803: aefaf3f 9799: 9b83972 9791: c351826 v: v3
git-mirror · Oct 11, 2005 · 79675e9 · 79675e9
1 parent 12d0695
commit 79675e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0c111c631e7ab4abd68920debd44259160812ef
+refs/heads/master: 6de505173e24e76bb33a2595312e0c2b44d49e58
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
@@ -905,7 +905,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)
 		send_sig(SIGKILL, current, 0);
 		goto out_free_dentry;
 	}
-	if (padzero(elf_bss)) {
+	if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
 		send_sig(SIGSEGV, current, 0);
 		retval = -EFAULT; /* Nobody gets to see this, but.. */
 		goto out_free_dentry;