PERFORCE change 43703 for review
Sam Leffler
sam at FreeBSD.org
Tue Dec 9 15:14:50 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=43703
Change 43703 by sam at 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);
More information about the p4-projects
mailing list