 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_ptrace.c,v 1.18 2014/11/09 17:48:07 maxv Exp $	*/
+/*	$NetBSD: linux_ptrace.c,v 1.19 2015/10/13 08:24:35 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * 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: linux_ptrace.c,v 1.18 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.19 2015/10/13 08:24:35 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/reg.h>
 #include <machine/pcb.h>
 #include <compat/linux/common/linux_types.h>
 @@ -130,49 +130,51 @@ linux_sys_ptrace_arch(struct lwp *l, con
 	default:
 		error = EIO;
 		goto out;
+	}
 	/* Find the process we are supposed to be operating on. */
 	mutex_enter(proc_lock);
 	if ((t = proc_find(SCARG(uap, pid))) == NULL) {
 		mutex_exit(proc_lock);
 		error = ESRCH;
 		goto out;
+	}
 	mutex_enter(t->p_lock);
 	mutex_exit(proc_lock);
 	/*
 	 * You cannot do what you want to the process if:
 	 * 1. It is not being traced at all,
 	 */
 	if (!ISSET(t->p_slflag, PSL_TRACED)) {
 		mutex_exit(t->p_lock);
 		mutex_exit(proc_lock);
 		error = EPERM;
 		goto out;
+	}
 	/*
 	 * 2. It is being traced by procfs (which has different signal
 	 *    delivery semantics),
 	 * 3. It is not being traced by _you_, or
 	 * 4. It is not currently stopped.
 	 */
 	if (ISSET(t->p_slflag, PSL_FSTRACE) || t->p_pptr != p ||
 	    t->p_stat != SSTOP || !t->p_waited) {
 		mutex_exit(t->p_lock);
 		mutex_exit(proc_lock);
 		error = EBUSY;
 		goto out;
+	}
 	mutex_exit(proc_lock);
 	/* XXX: ptrace needs revamp for multi-threading support. */
 	if (t->p_nlwps > 1) {
 		mutex_exit(t->p_lock);
 		error = ENOSYS;
 		goto out;
+	}
 	lt = LIST_FIRST(&t->p_lwps);
 	*retval = 0;
 	switch (request) {
 	case LINUX_PTRACE_GETREGS:
 		error = process_read_regs(lt, regs);
 		mutex_exit(t->p_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_ptrace.c,v 1.30 2014/11/09 17:48:07 maxv Exp $	*/
+/*	$NetBSD: linux_ptrace.c,v 1.31 2015/10/13 08:24:35 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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: linux_ptrace.c,v 1.30 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.31 2015/10/13 08:24:35 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/systm.h>
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/reg.h>
 #include <compat/linux/common/linux_types.h>
 @@ -175,49 +175,51 @@ linux_sys_ptrace_arch(struct lwp *l, con
 	default:
 		error = EIO;
 		goto out;
+	}
 	/* Find the process we are supposed to be operating on. */
 	mutex_enter(proc_lock);
 	if ((t = proc_find(SCARG(uap, pid))) == NULL) {
 		mutex_exit(proc_lock);
 		error = ESRCH;
 		goto out;
+	}
 	mutex_enter(t->p_lock);
 	mutex_exit(proc_lock);
 	/*
 	 * You cannot do what you want to the process if:
 	 * 1. It is not being traced at all,
 	 */
 	if (!ISSET(t->p_slflag, PSL_TRACED)) {
 		mutex_exit(t->p_lock);
 		mutex_exit(proc_lock);
 		error = EPERM;
 		goto out;
+	}
 	/*
 	 * 2. It is being traced by procfs (which has different signal
 	 *    delivery semantics),
 	 * 3. It is not being traced by _you_, or
 	 * 4. It is not currently stopped.
 	 */
 	if (ISSET(t->p_slflag, PSL_FSTRACE) || t->p_pptr != p ||
 	    t->p_stat != SSTOP || !t->p_waited) {
 		mutex_exit(t->p_lock);
 		mutex_exit(proc_lock);
 		error = EBUSY;
 		goto out;
+	}
 	mutex_exit(proc_lock);
 	/* XXX: ptrace needs revamp for multi-threading support. */
 	if (t->p_nlwps > 1) {
 		mutex_exit(t->p_lock);
 		error = ENOSYS;
 		goto out;
+	}
 	lt = LIST_FIRST(&t->p_lwps);
 	*retval = 0;
 	switch (request) {
 	case LINUX_PTRACE_GETREGS:
 		error = process_read_regs(lt, regs);
 		mutex_exit(t->p_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_ptrace.c,v 1.28 2014/11/09 17:48:08 maxv Exp $ */
+/*	$NetBSD: linux_ptrace.c,v 1.29 2015/10/13 08:24:35 pgoyette Exp $ */
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler and Emmanuel Dreyfus.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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: linux_ptrace.c,v 1.28 2014/11/09 17:48:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.29 2015/10/13 08:24:35 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/reg.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_ptrace.h>
 @@ -152,49 +152,51 @@ linux_sys_ptrace_arch(struct lwp *l, con
 	default:
 		error = EIO;
 		goto out;
+	}
 	/* Find the process we are supposed to be operating on. */
 	mutex_enter(proc_lock);
 	if ((t = proc_find(SCARG(uap, pid))) == NULL) {
 		mutex_exit(proc_lock);
 		error = ESRCH;
 		goto out;
+	}
 	mutex_enter(t->p_lock);
 	mutex_exit(proc_lock);
 	/*
 	 * You cannot do what you want to the process if:
 	 * 1. It is not being traced at all,
 	 */
 	if (!ISSET(t->p_slflag, PSL_TRACED)) {
 		mutex_exit(t->p_lock);
 		mutex_exit(proc_lock);
 		error = EPERM;
 		goto out;
+	}
 	/*
 	 * 2. It is being traced by procfs (which has different signal
 	 *    delivery semantics),
 	 * 3. It is not being traced by _you_, or
 	 * 4. It is not currently stopped.
 	 */
 	if (ISSET(t->p_slflag, PSL_FSTRACE) || t->p_pptr != p ||
 	    t->p_stat != SSTOP || !t->p_waited) {
 		mutex_exit(t->p_lock);
 		mutex_exit(proc_lock);
 		error = EBUSY;
 		goto out;
+	}
 	mutex_exit(proc_lock);
 	/* XXX: ptrace needs revamp for multi-threading support. */
 	if (t->p_nlwps > 1) {
 		mutex_exit(t->p_lock);
 		error = ENOSYS;
 		goto out;
+	}
 	lt = LIST_FIRST(&t->p_lwps);
 	*retval = 0;
 	switch (request) {
 	case LINUX_PTRACE_GETREGS:
 		error = process_read_regs(lt, regs);
 		mutex_exit(t->p_lock);