diff --git a/[refs] b/[refs]
index f8ce96c64acb..85c2ef77824e 100644
--- 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
index 7976a238f0a3..d4b15576e584 100644
--- 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;