From owner-svn-src-stable@FreeBSD.ORG  Thu Jun 13 19:35:57 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 10076FB0;
 Thu, 13 Jun 2013 19:35:57 +0000 (UTC) (envelope-from jhb@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 01BAB1F59;
 Thu, 13 Jun 2013 19:35:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DJZuts083611;
 Thu, 13 Jun 2013 19:35:56 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DJZuTk083610;
 Thu, 13 Jun 2013 19:35:56 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306131935.r5DJZuTk083610@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 13 Jun 2013 19:35:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251699 - stable/8/sys/rpc
X-SVN-Group: stable-8
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: Thu, 13 Jun 2013 19:35:57 -0000

Author: jhb
Date: Thu Jun 13 19:35:56 2013
New Revision: 251699
URL: http://svnweb.freebsd.org/changeset/base/251699

Log:
  MFC 249263: Fix a potential socket leak in the NFS server.

Modified:
  stable/8/sys/rpc/svc_vc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/rpc/   (props changed)

Modified: stable/8/sys/rpc/svc_vc.c
==============================================================================
--- stable/8/sys/rpc/svc_vc.c	Thu Jun 13 19:25:36 2013	(r251698)
+++ stable/8/sys/rpc/svc_vc.c	Thu Jun 13 19:35:56 2013	(r251699)
@@ -137,7 +137,9 @@ svc_vc_create(SVCPOOL *pool, struct sock
 	struct sockaddr* sa;
 	int error;
 
-	if (so->so_state & SS_ISCONNECTED) {
+	SOCK_LOCK(so);
+	if (so->so_state & (SS_ISCONNECTED|SS_ISDISCONNECTED)) {
+		SOCK_UNLOCK(so);
 		error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa);
 		if (error)
 			return (NULL);
@@ -145,6 +147,7 @@ svc_vc_create(SVCPOOL *pool, struct sock
 		free(sa, M_SONAME);
 		return (xprt);
 	}
+	SOCK_UNLOCK(so);
 
 	xprt = svc_xprt_alloc();
 	sx_init(&xprt->xp_lock, "xprt->xp_lock");