From owner-svn-src-stable-9@FreeBSD.ORG  Mon Apr  2 18:52:52 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BAF111065674;
	Mon,  2 Apr 2012 18:52:52 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A53248FC0C;
	Mon,  2 Apr 2012 18:52:52 +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 q32Iqq7n011386;
	Mon, 2 Apr 2012 18:52:52 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q32Iqq0V011384;
	Mon, 2 Apr 2012 18:52:52 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201204021852.q32Iqq0V011384@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Mon, 2 Apr 2012 18:52:52 +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: r233801 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2012 18:52:52 -0000

Author: trociny
Date: Mon Apr  2 18:52:52 2012
New Revision: 233801
URL: http://svn.freebsd.org/changeset/base/233801

Log:
  MFC r231976:
  
  unp_connect() may use a shared lock on the vnode to fetch the socket.
  
  Suggested by:	jhb
  Reviewed by:	jhb, kib, rwatson

Modified:
  stable/9/sys/kern/uipc_usrreq.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/uipc_usrreq.c
==============================================================================
--- stable/9/sys/kern/uipc_usrreq.c	Mon Apr  2 18:31:01 2012	(r233800)
+++ stable/9/sys/kern/uipc_usrreq.c	Mon Apr  2 18:52:52 2012	(r233801)
@@ -1272,8 +1272,8 @@ unp_connect(struct socket *so, struct so
 	UNP_PCB_UNLOCK(unp);
 
 	sa = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);
-	NDINIT(&nd, LOOKUP, MPSAFE | FOLLOW | LOCKLEAF, UIO_SYSSPACE, buf,
-	    td);
+	NDINIT(&nd, LOOKUP, MPSAFE | FOLLOW | LOCKSHARED | LOCKLEAF,
+	    UIO_SYSSPACE, buf, td);
 	error = namei(&nd);
 	if (error)
 		vp = NULL;