Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5d5c304 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

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: default avatarKinglong Mee <kinglongmee@gmail.com>
Fixes dc97618d (nfsd4: separate splice and readv cases)
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 35e634b8

fs/nfsd/nfs4xdr.c

+2 −5
Original line number Diff line number Diff line
@@ -3072,11 +3072,8 @@ static __be32 nfsd4_encode_splice_read( 
	__be32 nfserr;

	__be32 *p = xdr->p - 2;



	/*

	 * Don't inline pages unless we know there's room for eof,

	 * count, and possible padding:

	 */

	if (xdr->end - xdr->p < 3)

	/* Make sure there will be room for padding if needed */

	if (xdr->end - xdr->p < 1)

		return nfserr_resource;



	nfserr = nfsd_splice_read(read->rd_rqstp, file,