Skip to contentSkip to conversation

nfsd: Fixes for nfsd4_encode_read_plus_data()

PATCH New [email protected] 1 participant 2 messages Dec 11, 2020

Subsystems (2)
lore
Share & tools
lore
author maintainer
#1 lore raw

PATCH v2 2/2 nfsd: Don't set eof on a truncated READ_PLUS

In reply to [email protected]

From: Trond Myklebust <[email protected]>

If the READ_PLUS operation was truncated due to an error, then ensure we clear the 'eof' flag.

Fixes 9f0b5792f07d ("NFSD: Encode a full READ_PLUS reply")
---
 fs/nfsd/nfs4xdr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
fs/nfsd/nfs4xdr.c +5 -4
index 26f6e277101d..5f5169b9c2e9 100644
@@ -4736,14 +4736,15 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr,
 	if (nfserr && segments == 0)
 		xdr_truncate_encode(xdr, starting_len);
 	else {
-		tmp = htonl(eof);
-		write_bytes_to_xdr_buf(xdr->buf, starting_len,     &tmp, 4);
-		tmp = htonl(segments);
-		write_bytes_to_xdr_buf(xdr->buf, starting_len + 4, &tmp, 4);
 		if (nfserr) {
 			xdr_truncate_encode(xdr, last_segment);
 			nfserr = nfs_ok;
+			eof = 0;
 		}
+		tmp = htonl(eof);
+		write_bytes_to_xdr_buf(xdr->buf, starting_len,     &tmp, 4);
+		tmp = htonl(segments);
+		write_bytes_to_xdr_buf(xdr->buf, starting_len + 4, &tmp, 4);
 	}
 
 	return nfserr;
Signature · 1 line
2.29.2

[email protected]

author maintainer
#0 lore raw

PATCH v2 1/2 nfsd: Fixes for nfsd4_encode_read_plus_data()

From: Trond Myklebust <[email protected]>

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

Fixes 528b84934eb9 ("NFSD: Add READ_PLUS data support")
---
 fs/nfsd/nfs4xdr.c | 5 +++++
 1 file changed, 5 insertions(+)
fs/nfsd/nfs4xdr.c +5 -0
index 833a2c64dfe8..26f6e277101d 100644
@@ -4632,6 +4632,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);
@@ -4639,6 +4640,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;
 }
 
Signature · 1 line
2.29.2