From 7efd69c4d945250656507a52ad5d51e3a283ae2e Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Wed, 6 Dec 2006 20:40:16 -0800 Subject: [PATCH] --- yaml --- r: 42939 b: refs/heads/master c: 8de61e69c2feb10e5391cca67a3faf1d2bf77ce0 h: refs/heads/master i: 42937: 52c4b177ca5606f09c44abfce8ae81ec93dadd4d 42935: 4244ef615997de0117ee1f77176d7022fdedf791 v: v3 --- [refs] | 2 +- trunk/fs/binfmt_elf.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index efca2cce4f1e..3565735b6afa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 045f147f3290395661b56b9231fc4d221e150963 +refs/heads/master: 8de61e69c2feb10e5391cca67a3faf1d2bf77ce0 diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index 14ea630a857c..be5869d34999 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -544,7 +544,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) unsigned long reloc_func_desc = 0; char passed_fileno[6]; struct files_struct *files; - int have_pt_gnu_stack, executable_stack = EXSTACK_DEFAULT; + int executable_stack = EXSTACK_DEFAULT; unsigned long def_flags = 0; struct { struct elfhdr elf_ex; @@ -707,7 +707,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) executable_stack = EXSTACK_DISABLE_X; break; } - have_pt_gnu_stack = (i < loc->elf_ex.e_phnum); /* Some simple consistency checks for the interpreter */ if (elf_interpreter) {