From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 15:10:40 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7BEED16A4D0; Tue,  9 Dec 2003 15:10:40 -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 5601516A4CE
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:10:40 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7390A43D2B
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:10:37 -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 hB9NAbXJ034464
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 15:10:37 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NAboH034461
	for perforce@freebsd.org; Tue, 9 Dec 2003 15:10:37 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2003 15:10:37 -0800 (PST)
Message-Id: <200312092310.hB9NAboH034461@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 43699 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:10:40 -0000

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

Change 43699 by sam@sam_ebb on 2003/12/09 15:10:01

	o correct SOCK_ASSERT definition and renmae to SOCK_LOCK_ASSERT
	  for consistency
	o change sorele and sotryfree to assume(+assert) a held lock
	  and to zero the parameter to insure no use-after-free problems

Affected files ...

.. //depot/projects/netperf+sockets/sys/sys/socketvar.h#4 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/sys/socketvar.h#4 (text+ko) ====

@@ -148,7 +148,7 @@
 #define	SOCK_LOCK(_so)			SOCKBUF_LOCK(&(_so)->so_rcv)
 #define	SOCK_OWNED(_so)			SOCKBUF_OWNED(&(_so)->so_rcv)
 #define	SOCK_UNLOCK(_so)		SOCKBUF_UNLOCK(&(_so)->so_rcv)
-#define	SOCK_ASSERT(_so)		SOCKBUF_ASSERT(&(_so)->so_rcv)
+#define	SOCK_LOCK_ASSERT(_so)		SOCKBUF_LOCK_ASSERT(&(_so)->so_rcv)
 
 /*
  * Socket state bits.
@@ -289,15 +289,24 @@
 } while (0)
 
 #define sorele(so) do {					\
+	SOCK_LOCK_ASSERT(so);				\
 	if ((so)->so_count <= 0)			\
 		panic("sorele");			\
 	if (--(so)->so_count == 0)			\
 		sofree(so);				\
+	else {						\
+		SOCK_UNLOCK(so);			\
+		so = NULL;				\
+	}						\
 } while (0)
 
 #define sotryfree(so) do {				\
+	SOCK_LOCK_ASSERT(so);				\
 	if ((so)->so_count == 0)			\
 		sofree(so);				\
+	else						\
+		SOCK_UNLOCK(so);			\
+	so = NULL;					\
 } while (0)
 
 #define	sorwakeup(so) do {				\