diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-11-23 22:54:33 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-11-23 22:54:33 -0500 |
| commit | 2714f9b8e3c4b226d091e7218bf12cc27256a593 (patch) | |
| tree | 07e9ab0d089633d9a015cbfb8df708d252f688b4 /fs/nfsd/nfs4proc.c | |
| parent | 766a030823611640f70b031ae45c3f7f3e4caa4a (diff) | |
| parent | 0bbf78fb0ac62ef6f0970a49d7e0a1fb79d10dce (diff) | |
| download | linux-rt-2714f9b8e3c4b226d091e7218bf12cc27256a593.tar.gz | |
Merge tag 'v3.12.33' into v3.12-rt
This is the 3.12.33 stable release
Conflicts:
net/ipv4/ip_output.c
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 08c8e023c157..25024d5060da 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1233,7 +1233,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 |