From owner-svn-src-head@FreeBSD.ORG  Fri Dec  3 20:39:06 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DFAC51065672;
	Fri,  3 Dec 2010 20:39:06 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE1008FC26;
	Fri,  3 Dec 2010 20:39:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB3Kd6Ee020681;
	Fri, 3 Dec 2010 20:39:06 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB3Kd6IB020679;
	Fri, 3 Dec 2010 20:39:06 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201012032039.oB3Kd6IB020679@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 3 Dec 2010 20:39:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216158 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Dec 2010 20:39:07 -0000

Author: kib
Date: Fri Dec  3 20:39:06 2010
New Revision: 216158
URL: http://svn.freebsd.org/changeset/base/216158

Log:
  Trim whitespaces at the end of lines. Use the commit to record
  proper log message for r216150.
  
  MFC after:	1 week
  
  If unix socket has a unix socket attached as the rights that has a
  unix socket attached as the rights that has a unix socket attached as
  the rights ... Kernel may overflow the stack on attempt to close such
  socket.
  
  Only close the rights file in the context of the current close if the
  file is not unix domain socket. Otherwise, postpone the work to
  taskqueue, preventing unlimited recursion.
  
  The pass of the unix domain sockets over the SCM_RIGHTS message
  control is not widely used, and more, the close of the socket with
  still attached rights is mostly an application failure. The change
  should not affect the performance of typical users of SCM_RIGHTS.
  
  Reviewed by:	jeff, rwatson

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Fri Dec  3 19:22:18 2010	(r216157)
+++ head/sys/kern/uipc_usrreq.c	Fri Dec  3 20:39:06 2010	(r216158)
@@ -177,10 +177,10 @@ SYSCTL_ULONG(_net_local_seqpacket, OID_A
 	   &unpsp_sendspace, 0, "Default seqpacket send space.");
 SYSCTL_ULONG(_net_local_seqpacket, OID_AUTO, recvspace, CTLFLAG_RW,
 	   &unpsp_recvspace, 0, "Default seqpacket receive space.");
-SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, 
+SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0,
     "File descriptors in flight.");
 SYSCTL_INT(_net_local, OID_AUTO, deferred, CTLFLAG_RD,
-    &unp_defers_count, 0, 
+    &unp_defers_count, 0,
     "File descriptors deferred to taskqueue for close.");
 
 /*