diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:04 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:04 +0000 |
commit | 8eb52971d4749c0192358e1942ca83d8dc7e686b (patch) | |
tree | 418db997d718e14be2d5d9436d50985a4616156d /fs/nfsd/nfs4proc.c | |
parent | d91fd220833b8a6250ff6abf86c7e66a75655ee7 (diff) | |
parent | be70188832b22a8f1a49d0e3a3eb2209f9cfdc8a (diff) |
Merge tag 'v3.10.60' into linux-linaro-lsk
This is the 3.10.60 stable release
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
-rw-r--r-- | fs/nfsd/nfs4proc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 0f9ce13972d0..9240dd1678da 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1191,7 +1191,8 @@ static bool need_wrongsec_check(struct svc_rqst *rqstp) */ if (argp->opcnt == resp->opcnt) return false; - + if (next->opnum == OP_ILLEGAL) + return false; nextd = OPDESC(next); /* * Rest of 2.6.3.1.1: certain operations will return WRONGSEC |