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

Commit 7eed34f1 authored by Oleg Drokin's avatar Oleg Drokin Committed by J. Bruce Fields
Browse files

nfsd: Make creates return EEXIST instead of EACCES 



When doing a create (mkdir/mknod) on a name, it's worth
checking the name exists first before returning EACCES in case
the directory is not writeable by the user.
This makes return values on the client more consistent
regardless of whenever the entry there is cached in the local
cache or not.
Another positive side effect is certain programs only expect
EEXIST in that case even despite POSIX allowing any valid
error to be returned.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent c7995f8a

fs/nfsd/nfs4proc.c

+5 −1
Original line number Diff line number Diff line
@@ -605,8 +605,12 @@ 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_CREATE);

			   NFSD_MAY_EXEC);

	if (status)

		return status;

fs/nfsd/vfs.c

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

		goto out;



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

	/*

	 * 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);

	if (err)

		goto out;
@@ -1211,6 +1215,11 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, 
		goto out; 

	}



	/* Now let's see if we actually have permissions to create */

	err = nfsd_permission(rqstp, fhp->fh_export, dentry, NFSD_MAY_CREATE);

	if (err)

		goto out;



	if (!(iap->ia_valid & ATTR_MODE))

		iap->ia_mode = 0;

	iap->ia_mode = (iap->ia_mode & S_IALLUGO) | type;