diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-08-30 16:42:49 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-08-30 16:42:49 -0400 |
| commit | b8297cec2da30d3a5869597dbd7c8280d46a7dba (patch) | |
| tree | f9d59dec3cf856754e26a5a719630669366cb779 /fs/nfsd/nfs4state.c | |
| parent | 2f74f972d4cc7d83408ea0c32d424edcb44887bf (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
Merge tag 'v3.11-rc5' into for-3.12 branch
For testing purposes I want some nfs and nfsd bugfixes (specifically,
58cd57bfd9db3bc213bf9d6a10920f82095f0114 and previous nfsd patches, and
Trond's 4f3cc4809a98a165a9708b72b47de71643797bbd).
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1852f5351b2..5e609b17ada 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1259,6 +1259,8 @@ static bool svc_rqst_integrity_protected(struct svc_rqst *rqstp) struct svc_cred *cr = &rqstp->rq_cred; u32 service; + if (!cr->cr_gss_mech) + return false; service = gss_pseudoflavor_to_service(cr->cr_gss_mech, cr->cr_flavor); return service == RPC_GSS_SVC_INTEGRITY || service == RPC_GSS_SVC_PRIVACY; |