From 79675e9c5a9d45b28013a992fc1d79862c7bb1e2 Mon Sep 17 00:00:00 2001 From: "akpm@osdl.org" Date: Tue, 11 Oct 2005 08:29:08 -0700 Subject: [PATCH] --- yaml --- r: 9807 b: refs/heads/master c: 6de505173e24e76bb33a2595312e0c2b44d49e58 h: refs/heads/master i: 9805: 37787ead3df665167a3c4be506f443e062f27980 9803: aefaf3fe97fd00a410e9d91cd1c11cd840bdf6af 9799: 9b839722499cf6af3f3ec950c4df19722e9ab94e 9791: c351826ea3c6ca9fdfae157adf818adad103b080 v: v3 --- [refs] | 2 +- trunk/fs/binfmt_elf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;