From owner-svn-src-stable@FreeBSD.ORG  Fri Nov  9 19:31:32 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6123A544;
 Fri,  9 Nov 2012 19:31:32 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 455198FC08;
 Fri,  9 Nov 2012 19:31:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9JVWiw041024;
 Fri, 9 Nov 2012 19:31:32 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9JVWGv041023;
 Fri, 9 Nov 2012 19:31:32 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201211091931.qA9JVWGv041023@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Fri, 9 Nov 2012 19:31:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r242836 - stable/9/sys/netinet
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 19:31:32 -0000

Author: mjg
Date: Fri Nov  9 19:31:31 2012
New Revision: 242836
URL: http://svnweb.freebsd.org/changeset/base/242836

Log:
  MFC r242680:
  
  Fix possible spurious sbunlock in sctp_sorecvmsg.
  
  Approved by:	trasz (mentor)

Modified:
  stable/9/sys/netinet/sctputil.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctputil.c
==============================================================================
--- stable/9/sys/netinet/sctputil.c	Fri Nov  9 18:56:27 2012	(r242835)
+++ stable/9/sys/netinet/sctputil.c	Fri Nov  9 19:31:31 2012	(r242836)
@@ -5264,10 +5264,10 @@ sctp_sorecvmsg(struct socket *so,
 		    rwnd_req, block_allowed, so->so_rcv.sb_cc, uio->uio_resid);
 	}
 	error = sblock(&so->so_rcv, (block_allowed ? SBL_WAIT : 0));
-	sockbuf_lock = 1;
 	if (error) {
 		goto release_unlocked;
 	}
+	sockbuf_lock = 1;
 restart: