aboutsummaryrefslogtreecommitdiffstats
path: root/fs/binfmt_elf_fdpic.c
diff options
context:
space:
mode:
authorOllie Wild <aaw@google.com>2007-07-19 04:48:16 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:45 -0400
commitb6a2fea39318e43fee84fa7b0b90d68bed92d2ba (patch)
treec9c3619cb2730b5c10c7427b837146bce3d69156 /fs/binfmt_elf_fdpic.c
parentbdf4c48af20a3b0f01671799ace345e3d49576da (diff)
mm: variable length argument support
Remove the arg+env limit of MAX_ARG_PAGES by copying the strings directly from the old mm into the new mm. We create the new mm before the binfmt code runs, and place the new stack at the very top of the address space. Once the binfmt code runs and figures out where the stack should be, we move it downwards. It is a bit peculiar in that we have one task with two mm's, one of which is inactive. [a.p.zijlstra@chello.nl: limit stack size] Signed-off-by: Ollie Wild <aaw@google.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: <linux-arch@vger.kernel.org> Cc: Hugh Dickins <hugh@veritas.com> [bunk@stusta.de: unexport bprm_mm_init] Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/binfmt_elf_fdpic.c')
-rw-r--r--fs/binfmt_elf_fdpic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 9d62fbad3d4b..4739506fb083 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -621,8 +621,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
621 p = (char __user *) current->mm->arg_start; 621 p = (char __user *) current->mm->arg_start;
622 for (loop = bprm->argc; loop > 0; loop--) { 622 for (loop = bprm->argc; loop > 0; loop--) {
623 __put_user((elf_caddr_t) p, argv++); 623 __put_user((elf_caddr_t) p, argv++);
624 len = strnlen_user(p, PAGE_SIZE * MAX_ARG_PAGES); 624 len = strnlen_user(p, MAX_ARG_STRLEN);
625 if (!len || len > PAGE_SIZE * MAX_ARG_PAGES) 625 if (!len || len > MAX_ARG_STRLEN)
626 return -EINVAL; 626 return -EINVAL;
627 p += len; 627 p += len;
628 } 628 }
@@ -633,8 +633,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
633 current->mm->env_start = (unsigned long) p; 633 current->mm->env_start = (unsigned long) p;
634 for (loop = bprm->envc; loop > 0; loop--) { 634 for (loop = bprm->envc; loop > 0; loop--) {
635 __put_user((elf_caddr_t)(unsigned long) p, envp++); 635 __put_user((elf_caddr_t)(unsigned long) p, envp++);
636 len = strnlen_user(p, PAGE_SIZE * MAX_ARG_PAGES); 636 len = strnlen_user(p, MAX_ARG_STRLEN);
637 if (!len || len > PAGE_SIZE * MAX_ARG_PAGES) 637 if (!len || len > MAX_ARG_STRLEN)
638 return -EINVAL; 638 return -EINVAL;
639 p += len; 639 p += len;
640 } 640 }