From owner-svn-src-head@FreeBSD.ORG  Sun Aug 16 01:48:46 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 95C91106568C;
	Sun, 16 Aug 2009 01:48:46 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 846CC8FC4B;
	Sun, 16 Aug 2009 01:48:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7G1mkbI096712;
	Sun, 16 Aug 2009 01:48:46 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7G1mkmE096710;
	Sun, 16 Aug 2009 01:48:46 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200908160148.n7G1mkmE096710@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 16 Aug 2009 01:48:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196269 -
	head/sys/cddl/contrib/opensolaris/common/nvpair
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 16 Aug 2009 01:48:46 -0000

Author: marcel
Date: Sun Aug 16 01:48:46 2009
New Revision: 196269
URL: http://svn.freebsd.org/changeset/base/196269

Log:
  Fix misalignment in nvpair_native_embedded() caused by the compiler
  replacing the bzero(). See also revision 195627, which fixed the
  misalignment in nvpair_native_embedded_array().
  
  Approved by:	re (kensmith)

Modified:
  head/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c

Modified: head/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	Sun Aug 16 01:43:08 2009	(r196268)
+++ head/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	Sun Aug 16 01:48:46 2009	(r196269)
@@ -2523,14 +2523,15 @@ nvpair_native_embedded(nvstream_t *nvs, 
 {
 	if (nvs->nvs_op == NVS_OP_ENCODE) {
 		nvs_native_t *native = (nvs_native_t *)nvs->nvs_private;
-		nvlist_t *packed = (void *)
+		char *packed = (void *)
 		    (native->n_curr - nvp->nvp_size + NVP_VALOFF(nvp));
 		/*
 		 * Null out the pointer that is meaningless in the packed
 		 * structure. The address may not be aligned, so we have
 		 * to use bzero.
 		 */
-		bzero(&packed->nvl_priv, sizeof (packed->nvl_priv));
+		bzero(packed + offsetof(nvlist_t, nvl_priv),
+		    sizeof(((nvlist_t *)NULL)->nvl_priv));
 	}
 
 	return (nvs_embedded(nvs, EMBEDDED_NVL(nvp)));