diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2020-12-11 18:26:14 +0100 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2020-12-18 18:27:55 +0100 |
| commit | 72d78717c6d06adf65d2e3dccc96d9e9dc978593 (patch) | |
| tree | 4c87f2c8f26629cfa81ebac19af63558ed9ae16b /fs/nfsd/nfs4xdr.c | |
| parent | Merge branch 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-72d78717c6d06adf65d2e3dccc96d9e9dc978593.tar.xz linux-72d78717c6d06adf65d2e3dccc96d9e9dc978593.zip | |
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: 528b84934eb9 ("NFSD: Add READ_PLUS data support")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 45ee6b12ce5b..5dacc673ef17 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -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; } |