diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2022-05-20 10:41:55 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2022-05-27 22:51:15 +0300 |
| commit | 43075873f664db76209f1fdf87cb3961a113bfaf (patch) | |
| tree | 535f61822f5f05c9d0bdf4153a77f75afe5e8b15 | |
| parent | 3d097f7d985318f4f57189c9c47f3b19f1721f89 (diff) | |
| download | illumos-joyent-43075873f664db76209f1fdf87cb3961a113bfaf.tar.gz | |
14715 libsa: Fix a bug in nvlist creation
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@mnx.io>
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/libsa/zfs/nvlist.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index 58f7f184e0..ee48155eb7 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -34,4 +34,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2022.04.21.2 +BOOT_VERSION = $(LOADER_VERSION)-2022.05.27.1 diff --git a/usr/src/boot/libsa/zfs/nvlist.c b/usr/src/boot/libsa/zfs/nvlist.c index 96b0e63736..bf25d4f65d 100644 --- a/usr/src/boot/libsa/zfs/nvlist.c +++ b/usr/src/boot/libsa/zfs/nvlist.c @@ -1209,6 +1209,7 @@ nvlist_add_common(nvlist_t *nvl, const char *name, data_type_t type, nvl->nv_idx += sizeof (*hp); xdr.xdr_buf = nvl->nv_data; + xdr.xdr_buf_size = nvl->nv_asize; xdr.xdr_idx = nvl->nv_idx; xdr.xdr_idx += xdr.xdr_putuint(&xdr, namelen); |