From owner-svn-src-head@FreeBSD.ORG  Sat Dec 15 22:26:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 43B0E669;
 Sat, 15 Dec 2012 22:26:17 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 29B6E8FC0C;
 Sat, 15 Dec 2012 22:26:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFMQH3K048930;
 Sat, 15 Dec 2012 22:26:17 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFMQHA3048929;
 Sat, 15 Dec 2012 22:26:17 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201212152226.qBFMQHA3048929@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 15 Dec 2012 22:26:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244280 - head/sys/dev/wbwd
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.14
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, 15 Dec 2012 22:26:17 -0000

Author: pjd
Date: Sat Dec 15 22:26:16 2012
New Revision: 244280
URL: http://svnweb.freebsd.org/changeset/base/244280

Log:
  sbuf_trim() cannot be used on sbuf with drain function set.
  This fixes panic when listing sysctls on INVARIANTS-enabled kernel while
  having wbwd loaded.
  
  This panic was not fatal, at worst one additional space was printed.
  
  Also sbuf_trim() makes some sense even if drain function is set. The drain
  function is called only when buffer is to be expanded. So we could still trim
  existing buffer before drain is called. In this case it worked just fine - the
  trailing space was correctly trimmed.
  
  Obtained from:	WHEEL Systems
  MFC after:	1 week

Modified:
  head/sys/dev/wbwd/wbwd.c

Modified: head/sys/dev/wbwd/wbwd.c
==============================================================================
--- head/sys/dev/wbwd/wbwd.c	Sat Dec 15 21:57:34 2012	(r244279)
+++ head/sys/dev/wbwd/wbwd.c	Sat Dec 15 22:26:16 2012	(r244280)
@@ -208,9 +208,8 @@ sysctl_wb_debug(SYSCTL_HANDLER_ARGS)
 	sbuf_printf(&sb, "LDN8 (GPIO2, Watchdog): ");
 	sbuf_printf(&sb, "CRF5 0x%02x ", sc->reg_1);
 	sbuf_printf(&sb, "CRF6 0x%02x ", sc->reg_timeout);
-	sbuf_printf(&sb, "CRF7 0x%02x ", sc->reg_2);
+	sbuf_printf(&sb, "CRF7 0x%02x", sc->reg_2);
 
-	sbuf_trim(&sb);
 	error = sbuf_finish(&sb);
 	sbuf_delete(&sb);
 	return (error);