From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 15:14:50 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EC30516A4D0; Tue,  9 Dec 2003 15:14:49 -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 C7AFD16A4CE
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:14:49 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0A2E343D31
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:14:45 -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 hB9NEiXJ034670
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 15:14:44 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NEig0034667
	for perforce@freebsd.org; Tue, 9 Dec 2003 15:14:44 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2003 15:14:44 -0800 (PST)
Message-Id: <200312092314.hB9NEig0034667@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 43703 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:14:50 -0000

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

Change 43703 by sam@sam_ebb on 2003/12/09 15:14:38

	add explicit socket lock now required for sorele+sotryfree

Affected files ...

.. //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#2 edit
.. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#4 edit
.. //depot/projects/netperf+sockets/sys/net/raw_cb.c#2 edit
.. //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#4 edit
.. //depot/projects/netperf+sockets/sys/netatm/atm_socket.c#3 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#2 (text+ko) ====

@@ -1986,7 +1986,7 @@
 void
 fputsock(struct socket *so)
 {
-
+	SOCK_LOCK(so);
 	sorele(so);
 }
 

==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#4 (text+ko) ====

@@ -413,6 +413,7 @@
 
 	error = (*so->so_proto->pr_usrreqs->pru_abort)(so);
 	if (error) {
+		SOCK_LOCK(so);
 		sotryfree(so);	/* note: does not decrement the ref count */
 		return error;
 	}

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

@@ -36,7 +36,9 @@
 
 #include <sys/param.h>
 #include <sys/domain.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -97,6 +99,7 @@
 {
 	struct socket *so = rp->rcb_socket;
 
+	SOCK_LOCK(so);
 	so->so_pcb = 0;
 	sotryfree(so);
 	LIST_REMOVE(rp, list);

==== //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#4 (text+ko) ====

@@ -441,6 +441,7 @@
 static void
 at_pcbdetach( struct socket *so, struct ddpcb *ddp)
 {
+    SOCK_LOCK(so);
     soisdisconnected( so );
     so->so_pcb = 0;
     sotryfree(so);

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

@@ -173,6 +173,7 @@
 	/*
 	 * Break links and free control blocks
 	 */
+	SOCK_LOCK(so);
 	so->so_pcb = NULL;
 	sotryfree(so);