From owner-svn-src-head@FreeBSD.ORG  Sat May  2 08:31:17 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6049998A;
 Sat,  2 May 2015 08:31:17 +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 4EE971F28;
 Sat,  2 May 2015 08:31:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t428VHcQ019789;
 Sat, 2 May 2015 08:31:17 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t428VHGQ019788;
 Sat, 2 May 2015 08:31:17 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201505020831.t428VHGQ019788@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 2 May 2015 08:31:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282337 - 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: <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, 02 May 2015 08:31:17 -0000

Author: bz
Date: Sat May  2 08:31:16 2015
New Revision: 282337
URL: https://svnweb.freebsd.org/changeset/base/282337

Log:
  Fix an off-by-one bug in string/array handling which lead to memory overwrite
  and follow-up assertion errors on at least ARM after r282257,
  with nvp_magic being 0x6e7600:
  Assertion failed: ((nvp)->nvp_magic == 0x6e7670), function nvpair_name, file .../subr_nvpair.c, line 713.
  
  Sponsored by:	DARPA/AFRL

Modified:
  head/sys/kern/subr_nvpair.c

Modified: head/sys/kern/subr_nvpair.c
==============================================================================
--- head/sys/kern/subr_nvpair.c	Sat May  2 04:19:11 2015	(r282336)
+++ head/sys/kern/subr_nvpair.c	Sat May  2 08:31:16 2015	(r282337)
@@ -733,7 +733,7 @@ nvpair_allocv(const char *name, int type
 	if (nvp != NULL) {
 		nvp->nvp_name = (char *)(nvp + 1);
 		memcpy(nvp->nvp_name, name, namelen);
-		nvp->nvp_name[namelen + 1] = '\0';
+		nvp->nvp_name[namelen] = '\0';
 		nvp->nvp_type = type;
 		nvp->nvp_data = data;
 		nvp->nvp_datasize = datasize;