 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_exec.c,v 1.314 2011/04/26 16:36:42 joerg Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.315 2011/06/01 21:24:59 alnsn Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -49,27 +49,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.314 2011/04/26 16:36:42 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.315 2011/06/01 21:24:59 alnsn Exp $");
 #include "opt_ktrace.h"
 #include "opt_modular.h"
 #include "opt_syscall_debug.h"
 #include "veriexec.h"
 #include "opt_pax.h"
 #include "opt_sa.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -969,26 +969,30 @@ execve1(struct lwp *l, const char *path,
 		arginfo32.ps_envstr = (vaddr_t)arginfo.ps_envstr;
 		arginfo32.ps_nenvstr = arginfo.ps_nenvstr;
+	}
 	/* copy out the process's ps_strings structure */
 	if ((error = copyout(aip, (void *)p->p_psstrp, ps_strings_sz)) != 0) {
 		DPRINTF(("%s: ps_strings copyout %p->%p size %zu failed\n",
 		    __func__, aip, (void *)p->p_psstrp, ps_strings_sz));
 		goto exec_abort;
+	}
 	cwdexec(p);
 	fd_closeexec();		/* handle close on exec */
 	if (__predict_false(ktrace_on))
 		fd_ktrexecfd();
 	execsigs(p);		/* reset catched signals */
 	l->l_ctxlink = NULL;	/* reset ucontext link */
 	p->p_acflag &= ~AFORK;
 	mutex_enter(p->p_lock);
 	p->p_flag |= PK_EXEC;
 	mutex_exit(p->p_lock);
 	/*
 	 * Stop profiling.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $	*/
+/*	$NetBSD: kern_ktrace.c,v 1.157 2011/06/01 21:25:00 alnsn Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_ktrace.c	8.5 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.157 2011/06/01 21:25:00 alnsn Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/ktrace.h>
 #include <sys/kmem.h>
 #include <sys/syslog.h>
 #include <sys/filedesc.h>
 @@ -663,26 +663,45 @@ ktr_execarg(const void *bf, size_t len)
+}
 void
 ktr_execenv(const void *bf, size_t len)
+{
 	lwp_t *l = curlwp;
 	if (!KTRPOINT(l->l_proc, KTR_EXEC_ENV))
 		return;
 	ktr_kmem(l, KTR_EXEC_ENV, bf, len);
+}
 void
 ktr_execfd(int fd, u_int dtype)
+{
 	struct ktrace_entry *kte;
 	struct ktr_execfd* ktp;
 	lwp_t *l = curlwp;
 	if (!KTRPOINT(l->l_proc, KTR_EXEC_FD))
 		return;
 	if (ktealloc(&kte, (void *)&ktp, l, KTR_EXEC_FD, sizeof(*ktp)))
 		return;
 	ktp->ktr_fd = fd;
 	ktp->ktr_dtype = dtype;
 	ktraddentry(l, kte, KTA_WAITOK);
+}
 static void
 ktr_kmem(lwp_t *l, int type, const void *bf, size_t len)
+{
 	struct ktrace_entry *kte;
 	void *buf;
 	if (ktealloc(&kte, &buf, l, type, len))
 		return;
 	memcpy(buf, bf, len);
 	ktraddentry(l, kte, KTA_WAITOK);
+}
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_stub.c,v 1.32 2011/05/31 23:28:53 dyoung Exp $	*/
+/*	$NetBSD: kern_stub.c,v 1.33 2011/06/01 21:25:01 alnsn Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -52,27 +52,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)subr_xxx.c	8.3 (Berkeley) 3/29/95
  */
 /*
  * Stubs for system calls and facilities not included in the system.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.32 2011/05/31 23:28:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.33 2011/06/01 21:25:01 alnsn Exp $");
 #include "opt_ptrace.h"
 #include "opt_ktrace.h"
 #include "opt_sa.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/fstypes.h>
 #include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <sys/ktrace.h>
 #include <sys/intr.h>
 @@ -101,26 +101,27 @@ __weak_alias(ktr_emul,nullop);
 __weak_alias(ktr_geniov,nullop);
 __weak_alias(ktr_genio,nullop);
 __weak_alias(ktr_mibio,nullop);
 __weak_alias(ktr_namei,nullop);
 __weak_alias(ktr_namei2,nullop);
 __weak_alias(ktr_psig,nullop);
 __weak_alias(ktr_saupcall,nullop);
 __weak_alias(ktr_syscall,nullop);
 __weak_alias(ktr_sysret,nullop);
 __weak_alias(ktr_kuser,nullop);
 __weak_alias(ktr_mib,nullop);
 __weak_alias(ktr_execarg,nullop);
 __weak_alias(ktr_execenv,nullop);
 __weak_alias(ktr_execfd,nullop);
 __weak_alias(sys_fktrace,sys_nosys);	/* Syscalls */
 __weak_alias(sys_ktrace,sys_nosys);
 __weak_alias(sys_utrace,sys_nosys);
 int	ktrace_on;			/* Misc */
 __weak_alias(ktruser,enosys);
 __weak_alias(ktr_point,nullop);
 #endif	/* KTRACE */
 __weak_alias(device_register, voidop);
 __weak_alias(device_register_post_config, voidop);
 __weak_alias(spldebug_start, voidop);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_exec_fd.c,v 1.5 2011/02/15 15:54:28 pooka Exp $	*/
+/*	$NetBSD: subr_exec_fd.c,v 1.6 2011/06/01 21:25:01 alnsn Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,35 +17,64 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_exec_fd.c,v 1.5 2011/02/15 15:54:28 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_exec_fd.c,v 1.6 2011/06/01 21:25:01 alnsn Exp $");
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/syslog.h>
 #include <sys/vnode.h>
 #include <sys/ktrace.h>
 void
 fd_ktrexecfd(void)
+{
 	proc_t *p;
 	filedesc_t *fdp;
 	fdfile_t *ff;
 	lwp_t *l;
 	fdtab_t *dt;
 	int fd;
 	l = curlwp;
 	p = l->l_proc;
 	fdp = p->p_fd;
 	dt = fdp->fd_dt;
 	for (fd = 0; fd <= fdp->fd_lastfile; fd++) {
 		if ((ff = dt->dt_ff[fd]) == NULL) {
 			KASSERT(fd >= NDFDFILE);
 			continue;
+		}
 		KASSERT(fd >= NDFDFILE ||
 		    ff == (fdfile_t *)fdp->fd_dfdfile[fd]);
 		if (ff->ff_file == NULL)
 			continue;
 		ktr_execfd(fd, ff->ff_file->f_type);
+	}
+}
 /*
  * It is unsafe for set[ug]id processes to be started with file
  * descriptors 0..2 closed, as these descriptors are given implicit
  * significance in the Standard C library.  fdcheckstd() will create a
  * descriptor referencing /dev/null for each of stdin, stdout, and
  * stderr that is not already open.
  */
 #define CHECK_UPTO 3
 int
 fd_checkstd(void)
+{
 	struct proc *p;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: filedesc.h,v 1.59 2011/04/10 15:45:33 christos Exp $	*/
+/*	$NetBSD: filedesc.h,v 1.60 2011/06/01 21:25:02 alnsn Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -183,26 +183,27 @@ struct proc;
 void	fd_sys_init(void);
 int	fd_dupopen(int, int *, int, int);
 int	fd_alloc(struct proc *, int, int *);
 void	fd_tryexpand(struct proc *);
 int	fd_allocfile(file_t **, int *);
 void	fd_affix(struct proc *, file_t *, unsigned);
 void	fd_abort(struct proc *, file_t *, unsigned);
 filedesc_t *fd_copy(void);
 filedesc_t *fd_init(filedesc_t *);
 void	fd_share(proc_t *);
 void	fd_hold(lwp_t *);
 void	fd_free(void);
 void	fd_closeexec(void);
 void	fd_ktrexecfd(void);
 int	fd_checkstd(void);
 file_t	*fd_getfile(unsigned);
 file_t	*fd_getfile2(proc_t *, unsigned);
 void	fd_putfile(unsigned);
 int	fd_getvnode(unsigned, file_t **);
 int	fd_getsock(unsigned, struct socket **);
 void	fd_putvnode(unsigned);
 void	fd_putsock(unsigned);
 int	fd_close(unsigned);
 int	fd_dup(file_t *, int, int *, bool);
 int	fd_dup2(file_t *, unsigned);
 int	fd_clone(file_t *, unsigned, int, const struct fileops *, void *);
 void	fd_set_exclose(struct lwp *, int, bool);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ktrace.h,v 1.57 2011/04/27 00:00:46 joerg Exp $	*/
+/*	$NetBSD: ktrace.h,v 1.58 2011/06/01 21:25:02 alnsn Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -207,43 +207,52 @@ struct ktr_saupcall {
 	void *ktr_sas;
 	void *ktr_ap;
 	/*
 	 * followed by nevent sa_t's from sas[]
 	 */
 };
 /*
  * KTR_MIB - MIB name and data
  */
 #define KTR_MIB		14
 	/* Record contains MIB name */
 /*
  * KTR_EXEC_FD - Opened file descriptor from exec
  */
 #define KTR_EXEC_FD		15
 struct ktr_execfd {
 	int   ktr_fd;
 	u_int ktr_dtype; /* one of DTYPE_* constants */
 };
 /*
  * kernel trace points (in p_traceflag)
  */
 #define KTRFAC_MASK	0x00ffffff
 #define KTRFAC_SYSCALL	(1<<KTR_SYSCALL)
 #define KTRFAC_SYSRET	(1<<KTR_SYSRET)
 #define KTRFAC_NAMEI	(1<<KTR_NAMEI)
 #define KTRFAC_GENIO	(1<<KTR_GENIO)
 #define	KTRFAC_PSIG	(1<<KTR_PSIG)
 #define KTRFAC_CSW	(1<<KTR_CSW)
 #define KTRFAC_EMUL	(1<<KTR_EMUL)
 #define	KTRFAC_USER	(1<<KTR_USER)
 #define KTRFAC_EXEC_ARG	(1<<KTR_EXEC_ARG)
 #define KTRFAC_EXEC_ENV	(1<<KTR_EXEC_ENV)
 #define	KTRFAC_SAUPCALL	(1<<KTR_SAUPCALL)
 #define	KTRFAC_MIB	(1<<KTR_MIB)
 #define	KTRFAC_EXEC_FD	(1<<KTR_EXEC_FD)
 /*
  * trace flags (also in p_traceflags)
  */
 #define KTRFAC_PERSISTENT	0x80000000	/* persistent trace across sugid
 						   exec (exclusive) */
 #define KTRFAC_INHERIT	0x40000000	/* pass trace flags to children */
 #define KTRFAC_TRC_EMUL	0x10000000	/* ktrace KTR_EMUL before next trace */
 #define	KTRFAC_VER_MASK	0x0f000000	/* record version mask */
 #define	KTRFAC_VER_SHIFT	24	/* record version shift */
 #define	KTRFAC_VERSION(tf)	(((tf) & KTRFAC_VER_MASK) >> KTRFAC_VER_SHIFT)
 #define	KTRFACv0	(0 << KTRFAC_VER_SHIFT)
 @@ -276,26 +285,27 @@ void ktr_csw(int, int);
 void ktr_emul(void);
 void ktr_geniov(int, enum uio_rw, struct iovec *, size_t, int);
 void ktr_genio(int, enum uio_rw, const void *, size_t, int);
 void ktr_mibio(int, enum uio_rw, const void *, size_t, int);
 void ktr_namei(const char *, size_t);
 void ktr_namei2(const char *, size_t, const char *, size_t);
 void ktr_psig(int, sig_t, const sigset_t *, const ksiginfo_t *);
 void ktr_syscall(register_t, const register_t [], int);
 void ktr_sysret(register_t, int, register_t *);
 void ktr_kuser(const char *, void *, size_t);
 void ktr_mib(const int *a , u_int b);
 void ktr_execarg(const void *, size_t);
 void ktr_execenv(const void *, size_t);
 void ktr_execfd(int, u_int);
 void ktr_saupcall(struct lwp *, int, int, int, void *, void *, void *);
 static inline bool
 ktrpoint(int fac)
+{
     return __predict_false(ktrace_on) && __predict_false(ktr_point(1 << fac));
+}
 static inline void
 ktrcsw(int a, int b)
+{
 	if (__predict_false(ktrace_on))
 		ktr_csw(a, b);
 @@ -383,22 +393,29 @@ ktrexecarg(const void *a, size_t b)
+{
 	if (__predict_false(ktrace_on))
 		ktr_execarg(a, b);
+}
 static inline void
 ktrexecenv(const void *a, size_t b)
+{
 	if (__predict_false(ktrace_on))
 		ktr_execenv(a, b);
+}
 static inline void
 ktrexecfd(int fd, u_int dtype)
+{
 	if (__predict_false(ktrace_on))
 		ktr_execfd(fd, dtype);
+}
 static inline void
 ktrsaupcall(struct lwp *a, int b, int c, int d, void *e, void *f, void *g)
+{
 	if (__predict_false(ktrace_on))
 		ktr_saupcall(a, b, c, d, e, f, g);
+}
 #endif	/* !_KERNEL */
 #endif /* _SYS_KTRACE_H_ */