From owner-svn-src-all@FreeBSD.ORG  Mon Jun  7 04:01:39 2010
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 44C5B1065675;
	Mon,  7 Jun 2010 04:01:39 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 35E128FC0C;
	Mon,  7 Jun 2010 04:01:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5741dBq049015;
	Mon, 7 Jun 2010 04:01:39 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5741dfO049013;
	Mon, 7 Jun 2010 04:01:39 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <201006070401.o5741dfO049013@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 7 Jun 2010 04:01:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208883 - head/sys/netinet
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: Mon, 07 Jun 2010 04:01:39 -0000

Author: rrs
Date: Mon Jun  7 04:01:38 2010
New Revision: 208883
URL: http://svn.freebsd.org/changeset/base/208883

Log:
  Fix so we call socantrcvmore_locked so we
  don't see a race where we unlock to call
  the non-locked version and have the socket
  go away.
  
  MFC after:	1 week

Modified:
  head/sys/netinet/sctp_pcb.c

Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c	Mon Jun  7 03:08:52 2010	(r208882)
+++ head/sys/netinet/sctp_pcb.c	Mon Jun  7 04:01:38 2010	(r208883)
@@ -4675,8 +4675,8 @@ sctp_free_assoc(struct sctp_inpcb *inp, 
 					    SS_ISCONFIRMING |
 					    SS_ISCONNECTED);
 				}
+				socantrcvmore_locked(so);
 				SOCK_UNLOCK(so);
-				socantrcvmore(so);
 				sctp_sowwakeup(inp, so);
 				sctp_sorwakeup(inp, so);
 				SCTP_SOWAKEUP(so);