Module Name:    src
Committed By:   uebayasi
Date:           Mon Apr 14 13:14:38 UTC 2014

Modified Files:
        src/sys/kern: kern_exec.c

Log Message:
copyinargs: Redo previous; if given fakearg is longer than arg buf (which is
very unlikely to happen), there's no point to continue with truncated arg.
Just give up and return E2BIG.


To generate a diff of this commit:
cvs rdiff -u -r1.394 -r1.395 src/sys/kern/kern_exec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.394 src/sys/kern/kern_exec.c:1.395
--- src/sys/kern/kern_exec.c:1.394	Mon Apr 14 05:39:19 2014
+++ src/sys/kern/kern_exec.c	Mon Apr 14 13:14:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.394 2014/04/14 05:39:19 uebayasi Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.395 2014/04/14 13:14:38 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.394 2014/04/14 05:39:19 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.395 2014/04/14 13:14:38 uebayasi Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1423,7 +1423,7 @@ copyinargs(struct execve_data * restrict
 			if (len < maxlen)
 				len++;
 			else
-				len = maxlen;
+				return E2BIG;
 			ktrexecarg(tmpfap->fa_arg, len - 1);
 			dp += len;
 

Reply via email to