[src/netbsd-7]: src/sys/compat/linux/arch Pull up following revision(s) (requ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/521fd3a219cb
branches:  netbsd-7
changeset: 798473:521fd3a219cb
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 30 11:51:18 2014 +0000

description:
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.

diffstat:

 sys/compat/linux/arch/i386/linux_ptrace.c    |  7 ++++---
 sys/compat/linux/arch/powerpc/linux_ptrace.c |  7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 0991e7bebbe1 -r 521fd3a219cb sys/compat/linux/arch/i386/linux_ptrace.c
--- a/sys/compat/linux/arch/i386/linux_ptrace.c Thu Oct 30 10:44:07 2014 +0000
+++ b/sys/compat/linux/arch/i386/linux_ptrace.c Thu Oct 30 11:51:18 2014 +0000
@@ -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 @@
        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);
diff -r 0991e7bebbe1 -r 521fd3a219cb sys/compat/linux/arch/powerpc/linux_ptrace.c
--- a/sys/compat/linux/arch/powerpc/linux_ptrace.c      Thu Oct 30 10:44:07 2014 +0000
+++ b/sys/compat/linux/arch/powerpc/linux_ptrace.c      Thu Oct 30 11:51:18 2014 +0000
@@ -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 @@
        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);