Title: [6902] branches/2009R1/fs/binfmt_elf_fdpic.c: [#5278] FDPIC: Ignore the loader's PT_GNU_STACK when calculating the stack size
- Revision
- 6902
- Author
- vapier
- Date
- 2009-07-01 11:11:38 -0500 (Wed, 01 Jul 2009)
Log Message
[#5278] FDPIC: Ignore the loader's PT_GNU_STACK when calculating the stack size
Ignore the loader's PT_GNU_STACK when calculating the stack size, and only
consider the executable's PT_GNU_STACK, assuming the executable has one.
Currently the behaviour is to take the largest stack size and use that, but
that means you can't reduce the stack size in the executable. The loader's
stack size should probably only be used when executing the loader directly.
WARNING: This patch is slightly dangerous - it may render a system inoperable
if the loader's stack size is larger than that of important executables, and
the system relies unknowingly on this increasing the size of the stack.
Modified Paths
Diff
Modified: branches/2009R1/fs/binfmt_elf_fdpic.c (6901 => 6902)
--- branches/2009R1/fs/binfmt_elf_fdpic.c 2009-07-01 16:09:15 UTC (rev 6901)
+++ branches/2009R1/fs/binfmt_elf_fdpic.c 2009-07-01 16:11:38 UTC (rev 6902)
@@ -283,20 +283,23 @@
}
stack_size = exec_params.stack_size;
- if (stack_size < interp_params.stack_size)
- stack_size = interp_params.stack_size;
-
if (exec_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
executable_stack = EXSTACK_ENABLE_X;
else if (exec_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
executable_stack = EXSTACK_DISABLE_X;
- else if (interp_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
- executable_stack = EXSTACK_ENABLE_X;
- else if (interp_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
- executable_stack = EXSTACK_DISABLE_X;
else
executable_stack = EXSTACK_DEFAULT;
+ if (stack_size == 0) {
+ stack_size = interp_params.stack_size;
+ if (interp_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
+ executable_stack = EXSTACK_ENABLE_X;
+ else if (interp_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
+ executable_stack = EXSTACK_DISABLE_X;
+ else
+ executable_stack = EXSTACK_DEFAULT;
+ }
+
retval = -ENOEXEC;
if (stack_size == 0)
goto error;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
