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

Commit 832023bf authored by Bernd Schubert's avatar Bernd Schubert Committed by J. Bruce Fields
Browse files

nfsd4: Remove check for a 32-bit cookie in nfsd4_readdir() 



Fan Yong <yong.fan@whamcloud.com> noticed setting
FMODE_32bithash wouldn't work with nfsd v4, as
nfsd4_readdir() checks for 32 bit cookies. However, according to RFC 3530
cookies have a 64 bit type and cookies are also defined as u64 in
'struct nfsd4_readdir'. So remove the test for >32-bit values.

Cc: stable@kernel.org
Signed-off-by: default avatarBernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 322a8b03

fs/nfsd/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	readdir->rd_bmval[1] &= nfsd_suppattrs1(cstate->minorversion);

	readdir->rd_bmval[2] &= nfsd_suppattrs2(cstate->minorversion);



	if ((cookie > ~(u32)0) || (cookie == 1) || (cookie == 2) ||

	if ((cookie == 1) || (cookie == 2) ||

	    (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE)))

		return nfserr_bad_cookie;