From owner-svn-src-all@FreeBSD.ORG  Mon Feb  6 18:46:50 2012
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 C0E821065674;
	Mon,  6 Feb 2012 18:46:50 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF29C8FC1A;
	Mon,  6 Feb 2012 18:46:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q16IkoWI048865;
	Mon, 6 Feb 2012 18:46:50 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q16IkoQY048863;
	Mon, 6 Feb 2012 18:46:50 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201202061846.q16IkoQY048863@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Mon, 6 Feb 2012 18:46:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231096 - stable/9/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, 06 Feb 2012 18:46:50 -0000

Author: np
Date: Mon Feb  6 18:46:49 2012
New Revision: 231096
URL: http://svn.freebsd.org/changeset/base/231096

Log:
  MFC r229714
  
  Always release the inp lock before returning from tcp_detach.

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

Modified: stable/9/sys/netinet/tcp_usrreq.c
==============================================================================
--- stable/9/sys/netinet/tcp_usrreq.c	Mon Feb  6 18:15:46 2012	(r231095)
+++ stable/9/sys/netinet/tcp_usrreq.c	Mon Feb  6 18:46:49 2012	(r231096)
@@ -204,8 +204,10 @@ tcp_detach(struct socket *so, struct inp
 			tcp_discardcb(tp);
 			in_pcbdetach(inp);
 			in_pcbfree(inp);
-		} else
+		} else {
 			in_pcbdetach(inp);
+			INP_WUNLOCK(inp);
+		}
 	}
 }