[src/netbsd-2-0]: src/sys/kern Pull up revision 1.83 (requested by yamt in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/01d2815a48be
branches:  netbsd-2-0
changeset: 564812:01d2815a48be
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 04:03:05 2005 +0000

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

diffstat:

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

diffs (30 lines):

diff -r d280ed231039 -r 01d2815a48be sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c    Mon Jul 18 03:48:49 2005 +0000
+++ b/sys/kern/uipc_usrreq.c    Mon Jul 18 04:03:05 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_usrreq.c,v 1.74 2004/03/23 13:22:05 junyoung Exp $        */
+/*     $NetBSD: uipc_usrreq.c,v 1.74.2.1 2005/07/18 04:03:05 riz Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.74 2004/03/23 13:22:05 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.74.2.1 2005/07/18 04:03:05 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -309,8 +309,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: {