 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_process.c,v 1.172 2016/10/14 08:38:31 skrll Exp $	*/
+/*	$NetBSD: sys_process.c,v 1.173 2016/10/15 09:09:55 skrll Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 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.
 @@ -108,27 +108,27 @@
 /*
  * References:
  *	(1) Bach's "The Design of the UNIX Operating System",
  *	(2) sys/miscfs/procfs from UCB's 4.4BSD-Lite distribution,
  *	(3) the "4.4BSD Programmer's Reference Manual" published
  *		by USENIX and O'Reilly & Associates.
  * The 4.4BSD PRM does a reasonably good job of documenting what the various
  * ptrace() requests should actually do, and its text is quoted several times
  * in this file.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_process.c,v 1.172 2016/10/14 08:38:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_process.c,v 1.173 2016/10/15 09:09:55 skrll Exp $");
 #include "opt_ptrace.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/exec.h>
 #include <sys/pax.h>
 #include <sys/ptrace.h>
 #include <sys/uio.h>
 @@ -271,37 +271,37 @@ sys_ptrace(struct lwp *l, const struct s
 	 * proclist lock so that we can re-parent the target process.
 	 */
 	mutex_enter(proc_lock);
 	/* "A foolish consistency..." XXX */
 	if (req == PT_TRACE_ME) {
 		t = p;
 		mutex_enter(t->p_lock);
 	} else {
 		/* Find the process we're supposed to be operating on. */
 		t = proc_find(SCARG(uap, pid));
 		if (t == NULL) {
 			mutex_exit(proc_lock);
-			return (ESRCH);
+			return ESRCH;
+		}
 		/* XXX-elad */
 		mutex_enter(t->p_lock);
 		error = kauth_authorize_process(l->l_cred, KAUTH_PROCESS_CANSEE,
 		    t, KAUTH_ARG(KAUTH_REQ_PROCESS_CANSEE_ENTRY), NULL, NULL);
 		if (error) {
 			mutex_exit(proc_lock);
 			mutex_exit(t->p_lock);
-			return (ESRCH);
+			return ESRCH;
+		}
+	}
 	/*
 	 * Grab a reference on the process to prevent it from execing or
 	 * exiting.
 	 */
 	if (!rw_tryenter(&t->p_reflock, RW_READER)) {
 		mutex_exit(proc_lock);
 		mutex_exit(t->p_lock);
 		return EBUSY;
+	}
 @@ -546,27 +546,27 @@ sys_ptrace(struct lwp *l, const struct s
 		uio.uio_resid = piod.piod_len;
 		switch (piod.piod_op) {
 		case PIOD_READ_D:
 		case PIOD_READ_I:
 			uio.uio_rw = UIO_READ;
 			break;
 		case PIOD_WRITE_D:
 		case PIOD_WRITE_I:
 			/*
 			 * Can't write to a RAS
 			 */
 			if (ras_lookup(t, SCARG(uap, addr)) != (void *)-1) {
-				return (EACCES);
+				return EACCES;
+			}
 			uio.uio_rw = UIO_WRITE;
 			break;
 		case PIOD_READ_AUXV:
 			req = PT_READ_D;
 			uio.uio_rw = UIO_READ;
 			tmp = t->p_execsw->es_arglen * PROC_PTRSZ(t);
 			if (uio.uio_offset > tmp)
 				return EIO;
 			if (uio.uio_resid > tmp - uio.uio_offset)
 				uio.uio_resid = tmp - uio.uio_offset;
 			piod.piod_len = iov.iov_len = uio.uio_resid;
 			error = process_auxv_offset(t, &uio);
 @@ -1006,40 +1006,40 @@ process_doregs(struct lwp *curl /*tracer
 		kl = uio->uio_resid;
 	error = process_read_regs(l, &r);
 	if (error == 0)
 		error = uiomove(kv, kl, uio);
 	if (error == 0 && uio->uio_rw == UIO_WRITE) {
 		if (l->l_stat != LSSTOP)
 			error = EBUSY;
 		else
 			error = process_write_regs(l, &r);
+	}
 	uio->uio_offset = 0;
-	return (error);
+	return error;
 #else
-	return (EINVAL);
+	return EINVAL;
 #endif
+}
 int
 process_validregs(struct lwp *l)
+{
 #if defined(PT_SETREGS) || defined(PT_GETREGS)
-	return ((l->l_flag & LW_SYSTEM) == 0);
+	return (l->l_flag & LW_SYSTEM) == 0;
 #else
-	return (0);
+	return 0;
 #endif
+}
 int
 process_dofpregs(struct lwp *curl /*tracer*/,
     struct lwp *l /*traced*/,
     struct uio *uio)
+{
 #if defined(PT_GETFPREGS) || defined(PT_SETFPREGS)
 	int error;
 	struct fpreg r;
 	char *kv;
 	size_t kl;
 @@ -1055,87 +1055,87 @@ process_dofpregs(struct lwp *curl /*trac
 	if (kl > uio->uio_resid)
 		kl = uio->uio_resid;
 	error = process_read_fpregs(l, &r, &kl);
 	if (error == 0)
 		error = uiomove(kv, kl, uio);
 	if (error == 0 && uio->uio_rw == UIO_WRITE) {
 		if (l->l_stat != LSSTOP)
 			error = EBUSY;
 		else
 			error = process_write_fpregs(l, &r, kl);
+	}
 	uio->uio_offset = 0;
-	return (error);
+	return error;
 #else
-	return (EINVAL);
+	return EINVAL;
 #endif
+}
 int
 process_validfpregs(struct lwp *l)
+{
 #if defined(PT_SETFPREGS) || defined(PT_GETFPREGS)
-	return ((l->l_flag & LW_SYSTEM) == 0);
+	return (l->l_flag & LW_SYSTEM) == 0;
 #else
-	return (0);
+	return 0;
 #endif
+}
 #endif /* PTRACE */
 #if defined(KTRACE) || defined(PTRACE)
 int
 process_domem(struct lwp *curl /*tracer*/,
     struct lwp *l /*traced*/,
     struct uio *uio)
+{
 	struct proc *p = l->l_proc;	/* traced */
 	struct vmspace *vm;
 	int error;
 	size_t len;
 #ifdef PMAP_NEED_PROCWR
 	vaddr_t	addr;
 #endif
 	error = 0;
 	len = uio->uio_resid;
 	if (len == 0)
-		return (0);
+		return 0;
 #ifdef PMAP_NEED_PROCWR
 	addr = uio->uio_offset;
 #endif
 	vm = p->p_vmspace;
 	mutex_enter(&vm->vm_map.misc_lock);
 	if ((l->l_flag & LW_WEXIT) || vm->vm_refcnt < 1)
 		error = EFAULT;
 	if (error == 0)
 		p->p_vmspace->vm_refcnt++;  /* XXX */
 	mutex_exit(&vm->vm_map.misc_lock);
 	if (error != 0)
-		return (error);
+		return error;
 	error = uvm_io(&vm->vm_map, uio, pax_mprotect_prot(l));
 	uvmspace_free(vm);
 #ifdef PMAP_NEED_PROCWR
 	if (error == 0 && uio->uio_rw == UIO_WRITE)
 		pmap_procwr(p, addr, len);
 #endif
-	return (error);
+	return error;
+}
 #endif /* KTRACE || PTRACE */
 #if defined(KTRACE) || defined(PTRACE)
 void
 process_stoptrace(void)
+{
 	struct lwp *l = curlwp;
 	struct proc *p = l->l_proc, *pp;
 	mutex_enter(proc_lock);
 	mutex_enter(p->p_lock);
 	pp = p->p_pptr;