From owner-svn-src-user@freebsd.org  Sun Jan  3 07:37:48 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 31129A5F531
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sun,  3 Jan 2016 07:37:48 +0000 (UTC)
 (envelope-from ngie@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 02CE11AAC;
 Sun,  3 Jan 2016 07:37:47 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u037bl4H098355;
 Sun, 3 Jan 2016 07:37:47 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u037blL5098354;
 Sun, 3 Jan 2016 07:37:47 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601030737.u037blL5098354@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 3 Jan 2016 07:37:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293081 - user/ngie/stable-10-libnv/sys/kern
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jan 2016 07:37:48 -0000

Author: ngie
Date: Sun Jan  3 07:37:46 2016
New Revision: 293081
URL: https://svnweb.freebsd.org/changeset/base/293081

Log:
  MFC r282337,r283157:
  
  r282337 (by bz):
  
  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.
  
  r283157 (by oshogbo):
  
  Style.

Modified:
  user/ngie/stable-10-libnv/sys/kern/subr_nvpair.c
Directory Properties:
  user/ngie/stable-10-libnv/   (props changed)

Modified: user/ngie/stable-10-libnv/sys/kern/subr_nvpair.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/kern/subr_nvpair.c	Sun Jan  3 07:30:12 2016	(r293080)
+++ user/ngie/stable-10-libnv/sys/kern/subr_nvpair.c	Sun Jan  3 07:37:46 2016	(r293081)
@@ -734,7 +734,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;
@@ -742,7 +742,7 @@ nvpair_allocv(const char *name, int type
 	}
 
 	return (nvp);
-};
+}
 
 nvpair_t *
 nvpair_create_stringf(const char *name, const char *valuefmt, ...)