diff options
| author | Frank van der Linden <fllinden@amazon.com> | 2020-06-24 00:39:24 +0200 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2020-07-13 23:27:03 +0200 |
| commit | c11d7fd1b3178cc651d532bab54adca7f26ae0d0 (patch) | |
| tree | 743949a36cdf549ca6aaf18e592def523157447e /fs/nfsd/vfs.c | |
| parent | nfsd: define xattr functions to call into their vfs counterparts (diff) | |
| download | linux-c11d7fd1b3178cc651d532bab54adca7f26ae0d0.tar.xz linux-c11d7fd1b3178cc651d532bab54adca7f26ae0d0.zip | |
nfsd: take xattr bits into account for permission checks
Since the NFSv4.2 extended attributes extension defines 3 new access
bits for xattr operations, take them in to account when validating
what the client is asking for, and when checking permissions.
Signed-off-by: Frank van der Linden <fllinden@amazon.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/nfsd/vfs.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6d2955253f73..7d2933b85b65 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -612,6 +612,12 @@ static struct accessmap nfs3_regaccess[] = { { NFS3_ACCESS_MODIFY, NFSD_MAY_WRITE|NFSD_MAY_TRUNC }, { NFS3_ACCESS_EXTEND, NFSD_MAY_WRITE }, +#ifdef CONFIG_NFSD_V4 + { NFS4_ACCESS_XAREAD, NFSD_MAY_READ }, + { NFS4_ACCESS_XAWRITE, NFSD_MAY_WRITE }, + { NFS4_ACCESS_XALIST, NFSD_MAY_READ }, +#endif + { 0, 0 } }; @@ -622,6 +628,12 @@ static struct accessmap nfs3_diraccess[] = { { NFS3_ACCESS_EXTEND, NFSD_MAY_EXEC|NFSD_MAY_WRITE }, { NFS3_ACCESS_DELETE, NFSD_MAY_REMOVE }, +#ifdef CONFIG_NFSD_V4 + { NFS4_ACCESS_XAREAD, NFSD_MAY_READ }, + { NFS4_ACCESS_XAWRITE, NFSD_MAY_WRITE }, + { NFS4_ACCESS_XALIST, NFSD_MAY_READ }, +#endif + { 0, 0 } }; |