Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't

have a MIPS box at hand.

1 files changed, 4 insertions, 5 deletions

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index cb062d5b1..7b9cead81 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -210,13 +210,12 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 
 	/* Build args for interpreter */
 	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) goto _ret; 
 	bprm->argc++;
-	bprm->p = copy_strings(1, &iname_addr, bprm->page, bprm->p, 2);
+	retval = copy_strings_kernel(1, &iname_addr, bprm);
+	if (retval < 0) goto _ret; 
 	bprm->argc++;
-	retval = -E2BIG;
-	if (!bprm->p)
-		goto _ret;
 	bprm->filename = iname;	/* for binfmt_script */
 
 	dentry = open_namei(iname, 0, 0);