From owner-svn-src-head@FreeBSD.ORG  Sat Mar 14 18:46:34 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 039AA648;
 Sat, 14 Mar 2015 18:46:34 +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 E372D26C;
 Sat, 14 Mar 2015 18:46:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2EIkX9m022165;
 Sat, 14 Mar 2015 18:46:33 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2EIkX9f022164;
 Sat, 14 Mar 2015 18:46:33 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201503141846.t2EIkX9f022164@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Sat, 14 Mar 2015 18:46:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280000 - 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-1
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, 14 Mar 2015 18:46:34 -0000

Author: ian
Date: Sat Mar 14 18:46:33 2015
New Revision: 280000
URL: https://svnweb.freebsd.org/changeset/base/280000

Log:
  Use sbuf_new_for_sysctl() instead of plain sbuf_new() to ensure sysctl
  string returned to userland is nulterminated.
  
  PR:           195668

Modified:
  head/sys/kern/kern_fail.c

Modified: head/sys/kern/kern_fail.c
==============================================================================
--- head/sys/kern/kern_fail.c	Sat Mar 14 18:42:30 2015	(r279999)
+++ head/sys/kern/kern_fail.c	Sat Mar 14 18:46:33 2015	(r280000)
@@ -394,11 +394,10 @@ fail_point_sysctl(SYSCTL_HANDLER_ARGS)
 	int error;
 
 	/* Retrieving */
-	sbuf_new(&sb, NULL, 128, SBUF_AUTOEXTEND);
+	sbuf_new_for_sysctl(&sb, NULL, 128, req);
 	fail_point_get(fp, &sb);
 	sbuf_trim(&sb);
-	sbuf_finish(&sb);
-	error = SYSCTL_OUT(req, sbuf_data(&sb), sbuf_len(&sb));
+	error = sbuf_finish(&sb);
 	sbuf_delete(&sb);
 
 	/* Setting */