[src/netbsd-3]: src/sys/kern Pull up revision 1.83 (requested by yamt in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/ee253381a361
branches:  netbsd-3
changeset: 576562:ee253381a361
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jul 11 11:40:12 2005 +0000

description:
Pull up revision 1.83 (requested by yamt in ticket #573):
uipc_usrreq: plug mbuf leak.

diffstat:

 sys/kern/uipc_usrreq.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 7717ed2d24c5 -r ee253381a361 sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c    Mon Jul 11 11:38:43 2005 +0000
+++ b/sys/kern/uipc_usrreq.c    Mon Jul 11 11:40:12 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_usrreq.c,v 1.80 2005/02/26 21:34:56 perry Exp $   */
+/*     $NetBSD: uipc_usrreq.c,v 1.80.2.1 2005/07/11 11:40:12 tron Exp $        */
 
 /*-
  * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.80 2005/02/26 21:34:56 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.80.2.1 2005/07/11 11:40:12 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -304,8 +304,9 @@
                 * has the side-effect of preventing a caller from
                 * forging SCM_CREDS.
                 */
-               if (control && (error = unp_internalize(control, p)))
-                       break;
+               if (control && (error = unp_internalize(control, p))) {
+                       goto die;
+               }
                switch (so->so_type) {
 
                case SOCK_DGRAM: {