patch-2.3.5 linux/fs/binfmt_java.c

Next file: linux/fs/binfmt_misc.c
Previous file: linux/fs/binfmt_em86.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.4/linux/fs/binfmt_java.c linux/fs/binfmt_java.c
@@ -67,15 +67,18 @@
 		i_name++;
 	else
 		i_name = bprm->filename;
-	bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
+
+	retval = copy_strings_kernel(1, &i_name, bprm); 
+	if (retval < 0) 
+		return retval; 
 	bprm->argc++;
 
 	i_name = binfmt_java_interpreter;
-	bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
+	retval = copy_strings_kernel(1, &i_name, bprm); 
+	if (retval < 0) 
+		return retval; 
 	bprm->argc++;
 
-	if (!bprm->p) 
-		return -E2BIG;
 	/*
 	 * OK, now restart the process with the interpreter's dentry.
 	 */
@@ -114,15 +117,15 @@
 	 */
 	remove_arg_zero(bprm);
 	i_name = bprm->filename;
-	bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
+	retval = copy_strings_kernel(1, &i_name, bprm);
+	if (retval < 0) return retval; 
 	bprm->argc++;
 
 	i_name = binfmt_java_appletviewer;
-	bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
+	retval = copy_strings_kernel(1, &i_name, bprm);
+	if (retval < 0) return retval; 
 	bprm->argc++;
 
-	if (!bprm->p) 
-		return -E2BIG;
 	/*
 	 * OK, now restart the process with the interpreter's dentry.
 	 */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)