From owner-svn-src-all@FreeBSD.ORG  Thu Oct  9 17:52:48 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 499FD1065694;
	Thu,  9 Oct 2008 17:52:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 386098FC0C;
	Thu,  9 Oct 2008 17:52:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m99Hqm38067783;
	Thu, 9 Oct 2008 17:52:48 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m99HqmLs067782;
	Thu, 9 Oct 2008 17:52:48 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200810091752.m99HqmLs067782@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 9 Oct 2008 17:52:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183726 - in stable/7/sys: . kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2008 17:52:48 -0000

Author: jhb
Date: Thu Oct  9 17:52:47 2008
New Revision: 183726
URL: http://svn.freebsd.org/changeset/base/183726

Log:
  MFC: Wait until after dropping the receive socket buffer lock to allocate
  space to store the socket address stored in the first mbuf in a packet
  chain in soreceive_dgram().
  
  Approved by:	re (kensmith)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/kern/uipc_socket.c

Modified: stable/7/sys/kern/uipc_socket.c
==============================================================================
--- stable/7/sys/kern/uipc_socket.c	Thu Oct  9 14:55:45 2008	(r183725)
+++ stable/7/sys/kern/uipc_socket.c	Thu Oct  9 17:52:47 2008	(r183726)
@@ -1928,34 +1928,11 @@ soreceive_dgram(struct socket *so, struc
 	SBLASTRECORDCHK(&so->so_rcv);
 	SBLASTMBUFCHK(&so->so_rcv);
 	nextrecord = m->m_nextpkt;
-	if (pr->pr_flags & PR_ADDR) {
-		KASSERT(m->m_type == MT_SONAME,
-		    ("m->m_type == %d", m->m_type));
-		if (psa != NULL)
-			*psa = sodupsockaddr(mtod(m, struct sockaddr *),
-			    M_NOWAIT);
-		sbfree(&so->so_rcv, m);
-		so->so_rcv.sb_mb = m_free(m);
-		m = so->so_rcv.sb_mb;
-		sockbuf_pushsync(&so->so_rcv, nextrecord);
-	}
-	if (m == NULL) {
-		/* XXXRW: Can this happen? */
-		SOCKBUF_UNLOCK(&so->so_rcv);
-		return (0);
-	}
-	KASSERT(m->m_nextpkt == nextrecord,
-	    ("soreceive_dgram: post-control, nextrecord !sync"));
 	if (nextrecord == NULL) {
-		KASSERT(so->so_rcv.sb_mb == m,
-		    ("soreceive_dgram: post-control, sb_mb!=m"));
 		KASSERT(so->so_rcv.sb_lastrecord == m,
 		    ("soreceive_dgram: lastrecord != m"));
 	}
 
-	SBLASTRECORDCHK(&so->so_rcv);
-	SBLASTMBUFCHK(&so->so_rcv);
-	KASSERT(m == so->so_rcv.sb_mb, ("soreceive_dgram: m not sb_mb"));
 	KASSERT(so->so_rcv.sb_mb->m_nextpkt == nextrecord,
 	    ("soreceive_dgram: m_nextpkt != nextrecord"));
 
@@ -1978,6 +1955,19 @@ soreceive_dgram(struct socket *so, struc
 	SBLASTMBUFCHK(&so->so_rcv);
 	SOCKBUF_UNLOCK(&so->so_rcv);
 
+	if (pr->pr_flags & PR_ADDR) {
+		KASSERT(m->m_type == MT_SONAME,
+		    ("m->m_type == %d", m->m_type));
+		if (psa != NULL)
+			*psa = sodupsockaddr(mtod(m, struct sockaddr *),
+			    M_NOWAIT);
+		m = m_free(m);
+	}
+	if (m == NULL) {
+		/* XXXRW: Can this happen? */
+		return (0);
+	}
+
 	/*
 	 * Packet to copyout() is now in 'm' and it is disconnected from the
 	 * queue.