Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index d9e71fc..2eef1b0 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -737,10 +737,10 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)
 
 #ifdef __i386__
        /*
-        * In the exec-shield-disabled case turn off the CS limit
-        * completely:
+        * Turn off the CS limit completely if exec-shield disabled or
+        * NX active:
         */
-       if (!exec_shield)
+       if (!exec_shield || use_nx)
                arch_add_exec_range(current->mm, -1);
 #endif