From owner-svn-src-all@FreeBSD.ORG  Fri Dec  2 01:06:33 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE1E8106566B;
	Fri,  2 Dec 2011 01:06:33 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDB2A8FC16;
	Fri,  2 Dec 2011 01:06:33 +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 pB216XPX069544;
	Fri, 2 Dec 2011 01:06:33 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB216XCU069542;
	Fri, 2 Dec 2011 01:06:33 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201112020106.pB216XCU069542@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 2 Dec 2011 01:06:33 +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: r228193 - head/lib/libc/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Dec 2011 01:06:34 -0000

Author: obrien
Date: Fri Dec  2 01:06:33 2011
New Revision: 228193
URL: http://svn.freebsd.org/changeset/base/228193

Log:
  Tweak the r137233 fix to r136283 -- Code was making two send() attempts
  vs. the comment documented "If we are working with a privileged socket,
  then take only one attempt".  Make the code match.
  
  Furthermore, critical privileged applications that [over] log a vast amount
  can look like a DoS to this code.  Given it's unlikely the single reattempted
  send() will succeeded, avoid usurping the scheduler in a library API for a
  single non-critical facility in critical applications.
  
  Obtained from:	Juniper Networks
  Discussed with:	glebius

Modified:
  head/lib/libc/gen/syslog.c

Modified: head/lib/libc/gen/syslog.c
==============================================================================
--- head/lib/libc/gen/syslog.c	Fri Dec  2 00:38:47 2011	(r228192)
+++ head/lib/libc/gen/syslog.c	Fri Dec  2 01:06:33 2011	(r228193)
@@ -265,7 +265,7 @@ vsyslog(int pri, const char *fmt, va_lis
 	 *  1) syslogd was restarted
 	 *  2) /var/run/log is out of socket buffer space, which
 	 *     in most cases means local DoS.
-	 * We attempt to reconnect to /var/run/log to take care of
+	 * We attempt to reconnect to /var/run/log[priv] to take care of
 	 * case #1 and keep send()ing data to cover case #2
 	 * to give syslogd a chance to empty its socket buffer.
 	 *
@@ -281,13 +281,13 @@ vsyslog(int pri, const char *fmt, va_lis
 			connectlog();
 		}
 		do {
+			if (status == CONNPRIV)
+				break;
 			_usleep(1);
 			if (send(LogFile, tbuf, cnt, 0) >= 0) {
 				THREAD_UNLOCK();
 				return;
 			}
-			if (status == CONNPRIV)
-				break;
 		} while (errno == ENOBUFS);
 	} else {
 		THREAD_UNLOCK();