OpenZFS 6879 - Incorrect endianness swap

rtvd · behlendorf · commit 9f8026c802bf · 2016-05-09T11:22:00.000-07:00
Authored by: Dan Kimmel <dan.kimmel@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Paul Dagnelie <pcd@delphix.com> Ported-by: Denys Rtveliashvili <denys@rtveliashvili.name> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Incorrect endianness swap for drr_spill.drr_length in libzfs_sendrecv.c Instead of drr_write.drr_length, we should be assigning the result of the byteswap to drr_spill.drr_length. OpenZFS-issue: https ://www.illumos.org/issues/6879 OpenZFS-commit: https ://github.com/openzfs/openzfs/commit/74c8720 Closes #4613
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
@@ -2619,7 +2619,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,

Original file line number	Diff line number	Diff line change
`@@ -2619,7 +2619,7 @@ recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap)`
`2619`	`2619`	`break;`
`2620`	`2620`	`case DRR_SPILL:`
`2621`	`2621`	`if (byteswap) {`
`2622`		`- drr->drr_u.drr_write.drr_length =`
	`2622`	`+ drr->drr_u.drr_spill.drr_length =`
`2623`	`2623`	`BSWAP_64(drr->drr_u.drr_spill.drr_length);`
`2624`	`2624`	`}`
`2625`	`2625`	`(void) recv_read(hdl, fd, buf,`