diff options
| author | Weston Andros Adamson <dros@netapp.com> | 2012-10-02 14:49:51 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 14:55:41 -0700 |
| commit | bbd3a8eee82a2a6f4aa1cce60ccb014f25e5c560 (patch) | |
| tree | b8fb68e90af256e20bb25454a3574326c9824dae /fs | |
| parent | ddfc4e171292d63d7e3f8c95ff9c3ef9932870ce (diff) | |
| download | op-kernel-dev-bbd3a8eee82a2a6f4aa1cce60ccb014f25e5c560.zip op-kernel-dev-bbd3a8eee82a2a6f4aa1cce60ccb014f25e5c560.tar.gz | |
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: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1e0faf9..ccada68 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -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 */ |
