Commit 72d78717 authored by Trond Myklebust's avatar Trond Myklebust Committed by Chuck Lever
Browse files

nfsd: Fixes for nfsd4_encode_read_plus_data() 



Ensure that we encode the data payload + padding, and that we truncate
the preallocated buffer to the actual read size.

Fixes: 528b8493 ("NFSD: Add READ_PLUS data support")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 5ee863be

fs/nfsd/nfs4xdr.c

+5 −0
Original line number Diff line number Diff line
@@ -4756,6 +4756,7 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, 
			    resp->rqstp->rq_vec, read->rd_vlen, maxcount, eof);

	if (nfserr)

		return nfserr;

	xdr_truncate_encode(xdr, starting_len + 16 + xdr_align_size(*maxcount));



	tmp = htonl(NFS4_CONTENT_DATA);

	write_bytes_to_xdr_buf(xdr->buf, starting_len,      &tmp,   4);
@@ -4763,6 +4764,10 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, 
	write_bytes_to_xdr_buf(xdr->buf, starting_len + 4,  &tmp64, 8);

	tmp = htonl(*maxcount);

	write_bytes_to_xdr_buf(xdr->buf, starting_len + 12, &tmp,   4);



	tmp = xdr_zero;

	write_bytes_to_xdr_buf(xdr->buf, starting_len + 16 + *maxcount, &tmp,

			       xdr_pad_size(*maxcount));

	return nfs_ok;

}