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

Commit bbd3a8ee authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

NFSv4: don't check MAY_WRITE access bit in OPEN 



Don't check MAY_WRITE as a newly created file may not have write mode bits,
but POSIX allows the creating process to write regardless.
This is ok because NFSv4 OPEN ops handle write permissions correctly -
the ACCESS in the OPEN compound is to differentiate READ v EXEC permissions.

Fixes a regression due to commit 6168f62c (NFSv4: Add ACCESS operation to
OPEN compound)

Signed-off-by: default avatarWeston Andros Adamson <dros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ddfc4e17

fs/nfs/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -1661,10 +1661,10 @@ static int nfs4_opendata_access(struct rpc_cred *cred, 
		return 0;



	mask = 0;

	/* don't check MAY_WRITE - a newly created file may not have

	 * write mode bits, but POSIX allows the creating process to write */

	if (fmode & FMODE_READ)

		mask |= MAY_READ;

	if (fmode & FMODE_WRITE)

		mask |= MAY_WRITE;

	if (fmode & FMODE_EXEC)

		mask |= MAY_EXEC;
@@ -1673,7 +1673,7 @@ static int nfs4_opendata_access(struct rpc_cred *cred, 
	nfs_access_set_mask(&cache, opendata->o_res.access_result);

	nfs_access_add_cache(state->inode, &cache);



	if ((mask & ~cache.mask & (MAY_READ | MAY_WRITE | MAY_EXEC)) == 0)

	if ((mask & ~cache.mask & (MAY_READ | MAY_EXEC)) == 0)

		return 0;



	/* even though OPEN succeeded, access is denied. Close the file */