From owner-svn-src-stable@FreeBSD.ORG  Mon Feb  9 23:23:00 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 740EA10656DA;
	Mon,  9 Feb 2009 23:23:00 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 60F088FC1B;
	Mon,  9 Feb 2009 23:23:00 +0000 (UTC)
	(envelope-from rwatson@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 n19NN0O7074634;
	Mon, 9 Feb 2009 23:23:00 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n19NN0QL074633;
	Mon, 9 Feb 2009 23:23:00 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902092323.n19NN0QL074633@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 9 Feb 2009 23:23:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188425 - stable/6/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 09 Feb 2009 23:23:02 -0000

Author: rwatson
Date: Mon Feb  9 23:23:00 2009
New Revision: 188425
URL: http://svn.freebsd.org/changeset/base/188425

Log:
  In unp_connect(), don't unlock the global UNIX domain socket lock when
  UNP_CONNECTING is set, as the caller will do that.
  
  (Due to significantly different locking in 7.0 and later, this fix
  applies only to stable/7).
  
  PR:		kern/128974
  Submitted by:	Larry Baird <lab at gta dot com>

Modified:
  stable/6/sys/kern/uipc_usrreq.c

Modified: stable/6/sys/kern/uipc_usrreq.c
==============================================================================
--- stable/6/sys/kern/uipc_usrreq.c	Mon Feb  9 22:59:22 2009	(r188424)
+++ stable/6/sys/kern/uipc_usrreq.c	Mon Feb  9 23:23:00 2009	(r188425)
@@ -1027,10 +1027,8 @@ unp_connect(struct socket *so, struct so
 	if (len <= 0)
 		return (EINVAL);
 	strlcpy(buf, soun->sun_path, len + 1);
-	if (unp->unp_flags & UNP_CONNECTING) {
-		UNP_UNLOCK();
+	if (unp->unp_flags & UNP_CONNECTING)
 		return (EALREADY);
-	}
 	unp->unp_flags |= UNP_CONNECTING;
 	UNP_UNLOCK();
 	sa = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);