Commit fa08139d authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: drop unnecessary MAY_EXEC check from create 



We need an fh_verify to make sure we at least have a dentry, but actual
permission checks happen later.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 71423274

fs/nfsd/nfs4proc.c

+1 −6
Original line number Diff line number Diff line
@@ -605,12 +605,7 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 


	fh_init(&resfh, NFS4_FHSIZE);



	/*

	 * We just check that parent is accessible here, nfsd_* do their

	 * own access permission checks

	 */

	status = fh_verify(rqstp, &cstate->current_fh, S_IFDIR,

			   NFSD_MAY_EXEC);

	status = fh_verify(rqstp, &cstate->current_fh, S_IFDIR, NFSD_MAY_NOP);

	if (status)

		return status;

fs/nfsd/vfs.c

+1 −5
Original line number Diff line number Diff line
@@ -1236,11 +1236,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	if (isdotent(fname, flen))

		return nfserr_exist;



	/*

	 * Even though it is a create, first let's see if we are even allowed

	 * to peek inside the parent

	 */

	err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_EXEC);

	err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_NOP);

	if (err)

		return err;