diff options
author | Andrew Elble <aweits@rit.edu> | 2016-06-15 12:52:09 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2016-07-13 15:32:47 -0400 |
commit | ed94164398c935a42be7b129a478eb19c598b68a (patch) | |
tree | 54e540b879c62b023ff3d0f93ad537209bdf3ff4 /fs/nfsd/export.c | |
parent | dedeb13f9efb4439a37cf56317c8f25860dd667b (diff) | |
download | linux-ed94164398c935a42be7b129a478eb19c598b68a.tar.gz linux-ed94164398c935a42be7b129a478eb19c598b68a.tar.bz2 linux-ed94164398c935a42be7b129a478eb19c598b68a.zip |
nfsd: implement machine credential support for some operations
This addresses the conundrum referenced in RFC5661 18.35.3,
and will allow clients to return state to the server using the
machine credentials.
The biggest part of the problem is that we need to allow the client
to send a compound op with integrity/privacy on mounts that don't
have it enabled.
Add server support for properly decoding and using spo_must_enforce
and spo_must_allow bits. Add support for machine credentials to be
used for CLOSE, OPEN_DOWNGRADE, LOCKU, DELEGRETURN,
and TEST/FREE STATEID.
Implement a check so as to not throw WRONGSEC errors when these
operations are used if integrity/privacy isn't turned on.
Without this, Linux clients with credentials that expired while holding
delegations were getting stuck in an endless loop.
Signed-off-by: Andrew Elble <aweits@rit.edu>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/export.c')
-rw-r--r-- | fs/nfsd/export.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index b4d84b579f20..79de2f38dd63 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -954,6 +954,16 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp) rqstp->rq_cred.cr_flavor == RPC_AUTH_UNIX) return 0; } + + /* If the compound op contains a spo_must_allowed op, + * it will be sent with integrity/protection which + * will have to be expressly allowed on mounts that + * don't support it + */ + + if (nfsd4_spo_must_allow(rqstp)) + return 0; + return nfserr_wrongsec; } |