diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /fs/binfmt_script.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'fs/binfmt_script.c')
| -rw-r--r-- | fs/binfmt_script.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c index 6aa1508a4..8cc685aca 100644 --- a/fs/binfmt_script.c +++ b/fs/binfmt_script.c @@ -66,16 +66,17 @@ static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs) * user environment and arguments are stored. */ remove_arg_zero(bprm); - bprm->p = copy_strings(1, &bprm->filename, bprm->page, bprm->p, 2); + retval = copy_strings_kernel(1, &bprm->filename, bprm); + if (retval < 0) return retval; bprm->argc++; if (i_arg) { - bprm->p = copy_strings(1, &i_arg, bprm->page, bprm->p, 2); + retval = copy_strings_kernel(1, &i_arg, bprm); + if (retval < 0) return retval; bprm->argc++; } - bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2); + retval = copy_strings_kernel(1, &i_name, bprm); + if (retval) return retval; bprm->argc++; - if (!bprm->p) - return -E2BIG; /* * OK, now restart the process with the interpreter's dentry. */ |