diff options
| author | Linus Torvalds <[email protected]> | 2013-08-10 15:19:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-08-10 15:19:58 -0700 |
| commit | 022e5d098b3bcc4a9a75c24e910a08ff9d2321d2 (patch) | |
| tree | 3d73743a2258b03a7e7c5b52500d4d01f75c9424 /fs/nfsd/nfs4state.c | |
| parent | 1e24f76e231f2b68b01b61610ec235f7ea331513 (diff) | |
| parent | 58cd57bfd9db3bc213bf9d6a10920f82095f0114 (diff) | |
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields:
"Some fixes for a 4.1 feature that in retrospect probably should have
waited for 3.12.... But it appears to be working now"
* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID
nfsd4: Fix MACH_CRED NULL dereference
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 280acef6f0dc..43f42290e5df 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1264,6 +1264,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; |