nfsd4: fix xdr4 count of server in fs_location4

bcodding-rh · J. Bruce Fields · commit bf7491f1be5e · 2014-12-09T15:52:17.000-05:00
Fix a bug where nfsd4_encode_components_esc() incorrectly calculates the length of server array in fs_location4--note that it is a count of the number of array elements, not a length in bytes. Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Fixes: 082d4bd (nfsd4: "backfill" using write_bytes_to_xdr_buf) Cc: stable@vger.kernel.org Signed-off-by: J. Bruce Fields <bfields@redhat.com>
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
@@ -1817,7 +1817,7 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep,
 
 		str = end;
 	}
-	pathlen = htonl(xdr->buf->len - pathlen_offset);
+	pathlen = htonl(count);
 	write_bytes_to_xdr_buf(xdr->buf, pathlen_offset, &pathlen, 4);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1817,7 +1817,7 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep,`
`1817`	`1817`
`1818`	`1818`	`str = end;`
`1819`	`1819`	`}`
`1820`		`- pathlen = htonl(xdr->buf->len - pathlen_offset);`
	`1820`	`+ pathlen = htonl(count);`
`1821`	`1821`	`write_bytes_to_xdr_buf(xdr->buf, pathlen_offset, &pathlen, 4);`
`1822`	`1822`	`return 0;`
`1823`	`1823`	`}`