Module Name:    src
Committed By:   bouyer
Date:           Sat Sep  5 13:45:28 UTC 2009

Modified Files:
        src/sys/kern [netbsd-4-0]: kern_exec.c

Log Message:
Pull up following revision(s) (requested by dsl in ticket #1352):
        sys/kern/kern_exec.c: patch
Fix ktrace of data from iovec based system calls.
Fixes PR/41819


To generate a diff of this commit:
cvs rdiff -u -r1.232.2.2 -r1.232.2.2.6.1 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.232.2.2 src/sys/kern/kern_exec.c:1.232.2.2.6.1
--- src/sys/kern/kern_exec.c:1.232.2.2	Sat Dec 30 05:22:43 2006
+++ src/sys/kern/kern_exec.c	Sat Sep  5 13:45:28 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.232.2.2 2006/12/30 05:22:43 riz Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.232.2.2.6.1 2009/09/05 13:45:28 bouyer Exp $	*/
 
 /*-
  * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.232.2.2 2006/12/30 05:22:43 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.232.2.2.6.1 2009/09/05 13:45:28 bouyer Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_syscall_debug.h"
@@ -518,7 +518,11 @@
 			cp = *tmpfap;
 			while (*cp)
 				*dp++ = *cp++;
-			dp++;
+			*dp++ = 0;
+#ifdef KTRACE
+			if (KTRPOINT(p, KTR_EXEC_ARG))
+				ktrkmem(l, KTR_EXEC_ARG, *tmpfap, cp - *tmpfap);
+#endif
 
 			FREE(*tmpfap, M_EXEC);
 			tmpfap++; argc++;

Reply via email to