diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2016-09-01 14:46:33 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2016-09-01 14:46:33 +0000 |
| commit | e736489e04de589f4fdfbaa99b3c8552d8ba0370 (patch) | |
| tree | 38bb13091a5367c6896f22a165f97b319c71172d /cddl/contrib/opensolaris | |
| parent | b7d729391dce03e2b8a88ca8fa304f725c969d90 (diff) | |
| parent | 8e810a64c60d3a9dedc4e20490bb7c4f6d9f9958 (diff) | |
| download | src-e736489e04de589f4fdfbaa99b3c8552d8ba0370.tar.gz src-e736489e04de589f4fdfbaa99b3c8552d8ba0370.zip | |
MFV r302654:
6879 incorrect endianness swap for drr_spill.drr_length in libzfs_sendrecv.c
illumos/illumos-gate@20fea7a47472aceb64d3ed48cc2a3ea268bc4795
https://github.com/illumos/illumos-gate/commit/20fea7a47472aceb64d3ed48cc2a3ea26
8bc4795
https://www.illumos.org/issues/6879
In libzfs_sendrecv, there's a typo:
case DRR_SPILL:
if (byteswap) {
drr->drr_u.drr_write.drr_length =
BSWAP_64(drr->drr_u.drr_spill.drr_length);
}
Instead of drr_write.drr_length, we should be assigning the result of the
byteswap to drr_spill.drr_length.
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Author: Dan Kimmel <dan.kimmel@delphix.com>
Notes
Notes:
svn path=/head/; revision=305202
Diffstat (limited to 'cddl/contrib/opensolaris')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c index a40cb088a4c4..973ffa30fc4c 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c @@ -2967,7 +2967,7 @@ recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap) break; case DRR_SPILL: if (byteswap) { - drr->drr_u.drr_write.drr_length = + drr->drr_u.drr_spill.drr_length = BSWAP_64(drr->drr_u.drr_spill.drr_length); } (void) recv_read(hdl, fd, buf, |