From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 15:11:41 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 279B416A4D0; Tue,  9 Dec 2003 15:11:41 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 020FA16A4CE
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:11:41 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5DB9C43D31
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:11:39 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9NBdXJ034504
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 15:11:39 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NBc9g034501
	for perforce@freebsd.org; Tue, 9 Dec 2003 15:11:38 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2003 15:11:38 -0800 (PST)
Message-Id: <200312092311.hB9NBc9g034501@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43700 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Dec 2003 23:11:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=43700

Change 43700 by sam@sam_ebb on 2003/12/09 15:11:03

	o cleanup potential socket use potential free
	o IFC

Affected files ...

.. //depot/projects/netperf+sockets/sys/net/raw_usrreq.c#3 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net/raw_usrreq.c#3 (text+ko) ====

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.29 2003/09/11 21:40:20 ru Exp $
+ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.30 2003/11/18 00:39:03 rwatson Exp $
  */
 
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
@@ -143,8 +144,12 @@
 	if (rp == 0)
 		return EINVAL;
 	raw_disconnect(rp);
-	sotryfree(so);
-	soisdisconnected(so);	/* XXX huh? called after the sofree()? */
+	SOCK_LOCK(so);
+	if (so->so_count != 0) {
+		soisdisconnected(so);
+		SOCK_UNLOCK(so);
+	} else
+		sofree(so);
 	return 0;
 }
 
@@ -296,5 +301,5 @@
 	pru_connect2_notsupp, pru_control_notsupp, raw_udetach, 
 	raw_udisconnect, pru_listen_notsupp, raw_upeeraddr, pru_rcvd_notsupp,
 	pru_rcvoob_notsupp, raw_usend, pru_sense_null, raw_ushutdown,
-	raw_usockaddr, sosend, soreceive, sopoll
+	raw_usockaddr, sosend, soreceive, sopoll, pru_sosetlabel_null
 };