summaryrefslogtreecommitdiffstats
path: root/sys/kern/uipc_usrreq.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2010-12-03 20:39:06 +0000
committerkib <kib@FreeBSD.org>2010-12-03 20:39:06 +0000
commit1ffd755b88155bbf5b6a24803f1c24805e37f340 (patch)
tree9f8af529f9b2b837eeb1deb795ee8e032a62297a /sys/kern/uipc_usrreq.c
parentcbc03d7836d367a26880c77736410bd4af76ebe4 (diff)
downloadFreeBSD-src-1ffd755b88155bbf5b6a24803f1c24805e37f340.zip
FreeBSD-src-1ffd755b88155bbf5b6a24803f1c24805e37f340.tar.gz
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
Diffstat (limited to 'sys/kern/uipc_usrreq.c')
-rw-r--r--sys/kern/uipc_usrreq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 1c0903a..8920201 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -177,10 +177,10 @@ SYSCTL_ULONG(_net_local_seqpacket, OID_AUTO, maxseqpacket, CTLFLAG_RW,
&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.");
/*
OpenPOWER on IntegriCloud