From owner-svn-src-all@freebsd.org  Fri Jun  3 05:01:36 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 CC0CCB68EF0;
 Fri,  3 Jun 2016 05:01:36 +0000 (UTC)
 (envelope-from adrian@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 96172174D;
 Fri,  3 Jun 2016 05:01:36 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5351Zq0035704;
 Fri, 3 Jun 2016 05:01:35 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5351ZMg035703;
 Fri, 3 Jun 2016 05:01:35 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201606030501.u5351ZMg035703@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 3 Jun 2016 05:01:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301236 - head/sys/dev/drm2
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jun 2016 05:01:36 -0000

Author: adrian
Date: Fri Jun  3 05:01:35 2016
New Revision: 301236
URL: https://svnweb.freebsd.org/changeset/base/301236

Log:
  [drm] fix up hex_dump_to_buffer to not overflow linebuf.
  
  That check wasn't enough to handle appending a two byte character
  following it.
  
  This prevented my T400 (Intel Core 2 Duo P8400) from attaching;
  it would panic from a stack overflow detection.

Modified:
  head/sys/dev/drm2/drm_os_freebsd.c

Modified: head/sys/dev/drm2/drm_os_freebsd.c
==============================================================================
--- head/sys/dev/drm2/drm_os_freebsd.c	Fri Jun  3 03:40:39 2016	(r301235)
+++ head/sys/dev/drm2/drm_os_freebsd.c	Fri Jun  3 05:01:35 2016	(r301236)
@@ -422,7 +422,7 @@ hex_dump_to_buffer(const void *buf, size
 			}
 		}
 
-		if (j > linebuflen - 1)
+		if (j > linebuflen - 4)
 			break;
 
 		sprintf(linebuf + j, "%02X", c);