p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NFSD: Fix bad checking of space for padding in splice read 

Note that the caller has already reserved space for count and eof, so
xdr->p has already moved past them, only the padding remains.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Fixes dc97618ddd (nfsd4: separate splice and readv cases)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Kinglong Mee 2014-07-09 21:51:27 +08:00 committed by J. Bruce Fields
parent 35e634b83c
commit d5d5c304b1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfsd/nfs4xdr.c
View File

@ -3072,11 +3072,8 @@ static __be32 nfsd4_encode_splice_read(
__be32 nfserr; __be32 nfserr;
__be32 *p = xdr->p - 2; __be32 *p = xdr->p - 2;
/* /* Make sure there will be room for padding if needed */
* Don't inline pages unless we know there's room for eof, if (xdr->end - xdr->p < 1)
* count, and possible padding:
*/
if (xdr->end - xdr->p < 3)
return nfserr_resource; return nfserr_resource;
nfserr = nfsd_splice_read(read->rd_rqstp, file, nfserr = nfsd_splice_read(read->rd_rqstp, file,