From owner-svn-src-head@FreeBSD.ORG  Sat Jun 28 03:59:05 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1C7C2201;
 Sat, 28 Jun 2014 03:59:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 099092D5C;
 Sat, 28 Jun 2014 03:59:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5S3x4hQ098858;
 Sat, 28 Jun 2014 03:59:04 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5S3x4xV098857;
 Sat, 28 Jun 2014 03:59:04 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201406280359.s5S3x4xV098857@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sat, 28 Jun 2014 03:59:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267993 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Sat, 28 Jun 2014 03:59:05 -0000

Author: hselasky
Date: Sat Jun 28 03:59:04 2014
New Revision: 267993
URL: http://svnweb.freebsd.org/changeset/base/267993

Log:
  Fix regression issue after r267961. Handle special string case for
  SYSCTLs like previously.
  
  MFC after:	2 weeks
  Reported by:	several people

Modified:
  head/sys/kern/kern_sysctl.c

Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c	Sat Jun 28 03:56:17 2014	(r267992)
+++ head/sys/kern/kern_sysctl.c	Sat Jun 28 03:59:04 2014	(r267993)
@@ -1210,9 +1210,12 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS
 	size_t outlen;
 	int error = 0;
 
-	/* check for zero-length buffer */
+	/*
+	 * A zero-length buffer indicates a fixed size read-only
+	 * string:
+	 */
 	if (arg2 == 0)
-		return (ENOMEM);
+		arg2 = strlen((char *)arg1) + 1;
 
 	if (req->oldptr != NULL) {
 		char *tmparg;