diff options
author | marcel <marcel@FreeBSD.org> | 2009-08-16 01:48:46 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2009-08-16 01:48:46 +0000 |
commit | 6d86429b0a7a9566111f9e3ac9c6d76d969de452 (patch) | |
tree | 250dda5c6353177505f6a2def17cae392448f766 /sys/cddl/contrib/opensolaris/common | |
parent | 1ce39f9425ccaf4a10ddfc4f4bb3db453847609b (diff) | |
download | FreeBSD-src-6d86429b0a7a9566111f9e3ac9c6d76d969de452.zip FreeBSD-src-6d86429b0a7a9566111f9e3ac9c6d76d969de452.tar.gz |
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)
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common')
-rw-r--r-- | sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c index e573334..eb824c7 100644 --- a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c +++ b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c @@ -2523,14 +2523,15 @@ nvpair_native_embedded(nvstream_t *nvs, nvpair_t *nvp) { 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))); |