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

Commit ae254dac authored by Andrew Elble's avatar Andrew Elble Committed by J. Bruce Fields
Browse files

nfsd: check for use of the closed special stateid 



Prevent the use of the closed (invalid) special stateid by clients.

Signed-off-by: default avatarAndrew Elble <aweits@rit.edu>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 64ebe124

fs/nfsd/nfs4state.c

+5 −2
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static u64 current_sessionid = 1; 
#define ZERO_STATEID(stateid) (!memcmp((stateid), &zero_stateid, sizeof(stateid_t)))

#define ONE_STATEID(stateid)  (!memcmp((stateid), &one_stateid, sizeof(stateid_t)))

#define CURRENT_STATEID(stateid) (!memcmp((stateid), &currentstateid, sizeof(stateid_t)))

#define CLOSE_STATEID(stateid)  (!memcmp((stateid), &close_stateid, sizeof(stateid_t)))



/* forward declarations */

static bool check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner);
@@ -4936,7 +4937,8 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid) 
	struct nfs4_stid *s;

	__be32 status = nfserr_bad_stateid;



	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))

	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||

		CLOSE_STATEID(stateid))

		return status;

	/* Client debugging aid. */

	if (!same_clid(&stateid->si_opaque.so_clid, &cl->cl_clientid)) {
@@ -4994,7 +4996,8 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, 
	else if (typemask & NFS4_DELEG_STID)

		typemask |= NFS4_REVOKED_DELEG_STID;



	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))

	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||

		CLOSE_STATEID(stateid))

		return nfserr_bad_stateid;

	status = lookup_clientid(&stateid->si_opaque.so_clid, cstate, nn);

	if (status == nfserr_stale_clientid) {