CVS commit: [netbsd-7] src/sys/compat/linux/arch

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Thu Oct 30 11:51:18 UTC 2014

Modified Files:
        src/sys/compat/linux/arch/i386 [netbsd-7]: linux_ptrace.c
        src/sys/compat/linux/arch/powerpc [netbsd-7]: linux_ptrace.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #163):
        sys/compat/linux/arch/i386/linux_ptrace.c: revision 1.29
        sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.26
        sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.27
Fix four memory leaks in compat/linux.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/compat/linux/arch/i386/linux_ptrace.c
cvs rdiff -u -r1.25 -r1.25.2.1 \
    src/sys/compat/linux/arch/powerpc/linux_ptrace.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/compat/linux/arch/i386/linux_ptrace.c
diff -u src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28 src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28.2.1
--- src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28	Tue Apr 15 17:53:09 2014
+++ src/sys/compat/linux/arch/i386/linux_ptrace.c	Thu Oct 30 11:51:18 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_ptrace.c,v 1.28 2014/04/15 17:53:09 maxv Exp $	*/
+/*	$NetBSD: linux_ptrace.c,v 1.28.2.1 2014/10/30 11:51:18 martin Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.28 2014/04/15 17:53:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.28.2.1 2014/10/30 11:51:18 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -182,7 +182,8 @@ linux_sys_ptrace_arch(struct lwp *l, con
 	mutex_enter(proc_lock);
 	if ((t = proc_find(SCARG(uap, pid))) == NULL) {
 		mutex_exit(proc_lock);
-		return ESRCH;
+		error = ESRCH;
+		goto out;
 	}
 	mutex_enter(t->p_lock);
 	mutex_exit(proc_lock);

Index: src/sys/compat/linux/arch/powerpc/linux_ptrace.c
diff -u src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25 src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25.2.1
--- src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25	Tue Apr 15 17:53:09 2014
+++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c	Thu Oct 30 11:51:18 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_ptrace.c,v 1.25 2014/04/15 17:53:09 maxv Exp $ */
+/*	$NetBSD: linux_ptrace.c,v 1.25.2.1 2014/10/30 11:51:18 martin Exp $ */
 
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.25 2014/04/15 17:53:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.25.2.1 2014/10/30 11:51:18 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -159,7 +159,8 @@ linux_sys_ptrace_arch(struct lwp *l, con
 	mutex_enter(proc_lock);
 	if ((t = proc_find(SCARG(uap, pid))) == NULL) {
 		mutex_exit(proc_lock);
-		return ESRCH;
+		error = ESRCH;
+		goto out;
 	}
 	mutex_enter(t->p_lock);
 	mutex_exit(proc_lock);