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

Commit 9048f810 authored by Jeff Layton's avatar Jeff Layton Committed by Sasha Levin
Browse files

nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid 



[ Upstream commit 1ccdd6c6e9a342c2ed4ced38faa67303226a2a6a ]

commit 8fcd461db7c09337b6d2e22d25eb411123f379e3 upstream.

Currently, preprocess_stateid_op calls nfs4_check_olstateid which
verifies that the open stateid corresponds to the current filehandle in the
call by calling nfs4_check_fh.

If the stateid is a NFS4_DELEG_STID however, then no such check is done.
This could cause incorrect enforcement of permissions, because the
nfsd_permission() call in nfs4_check_file uses current the current
filehandle, but any subsequent IO operation will use the file descriptor
in the stateid.

Move the call to nfs4_check_fh into nfs4_check_file instead so that it
can be done for all stateid types.

Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
[bfields: moved fh check to avoid NULL deref in special stateid case]
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 493a50c6

fs/nfsd/nfs4state.c

+6 −6
Original line number Diff line number Diff line
@@ -4285,9 +4285,9 @@ laundromat_main(struct work_struct *laundry) 
	queue_delayed_work(laundry_wq, &nn->laundromat_work, t*HZ);

}



static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_ol_stateid *stp)

static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_stid *stp)

{

	if (!nfsd_fh_match(&fhp->fh_handle, &stp->st_stid.sc_file->fi_fhandle))

	if (!nfsd_fh_match(&fhp->fh_handle, &stp->sc_file->fi_fhandle))

		return nfserr_bad_stateid;

	return nfs_ok;

}
@@ -4487,9 +4487,6 @@ nfs4_check_olstateid(struct svc_fh *fhp, struct nfs4_ol_stateid *ols, int flags) 
{

	__be32 status;



	status = nfs4_check_fh(fhp, ols);

	if (status)

		return status;

	status = nfsd4_check_openowner_confirmed(ols);

	if (status)

		return status;
@@ -4541,6 +4538,9 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate, 
		status = nfserr_bad_stateid;

		break;

	}

	if (status)

		goto out;

	status = nfs4_check_fh(fhp, s);



	if (!status && filpp) {

		*filpp = nfs4_find_file(s, flags);
@@ -4650,7 +4650,7 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_compound_state *cstate, stateid_ 
	status = check_stateid_generation(stateid, &stp->st_stid.sc_stateid, nfsd4_has_session(cstate));

	if (status)

		return status;

	return nfs4_check_fh(current_fh, stp);

	return nfs4_check_fh(current_fh, &stp->st_stid);

}



/*