From owner-svn-src-head@freebsd.org  Mon Nov 23 18:45:36 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A951A35FF4;
 Mon, 23 Nov 2015 18:45:36 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 602FA1174;
 Mon, 23 Nov 2015 18:45:36 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tANIjZ4Y075767;
 Mon, 23 Nov 2015 18:45:35 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANIjZfx075766;
 Mon, 23 Nov 2015 18:45:35 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201511231845.tANIjZfx075766@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 23 Nov 2015 18:45:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291217 - 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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2015 18:45:36 -0000

Author: markj
Date: Mon Nov 23 18:45:35 2015
New Revision: 291217
URL: https://svnweb.freebsd.org/changeset/base/291217

Log:
  The buffer passed to an sbuf drain callback is not necessarily
  null-terminated, so don't assume that it is.
  
  Reported by:	pho
  X-MFC-With:	r291059

Modified:
  head/sys/kern/subr_witness.c

Modified: head/sys/kern/subr_witness.c
==============================================================================
--- head/sys/kern/subr_witness.c	Mon Nov 23 18:20:32 2015	(r291216)
+++ head/sys/kern/subr_witness.c	Mon Nov 23 18:45:35 2015	(r291217)
@@ -2987,7 +2987,7 @@ static int
 witness_output_drain(void *arg __unused, const char *data, int len)
 {
 
-	witness_output("%s", data);
+	witness_output("%.*s", len, data);
 	return (len);
 }