diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-10-22 14:46:29 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-12-14 16:23:50 +0000 |
| commit | 758bcfbbe07b5afed0d62be4015ed73a165455b8 (patch) | |
| tree | 21297ffed73a0536507a23136891e021aa0e51e2 /fs/nfsd | |
| parent | b4e59eddd5b2ceb8f45e7f5203e36dac447c4805 (diff) | |
| download | kernel_samsung_smdk4412-758bcfbbe07b5afed0d62be4015ed73a165455b8.zip kernel_samsung_smdk4412-758bcfbbe07b5afed0d62be4015ed73a165455b8.tar.gz kernel_samsung_smdk4412-758bcfbbe07b5afed0d62be4015ed73a165455b8.tar.bz2 | |
nfsd4: fix crash on unknown operation number
commit 51904b08072a8bf2b9ed74d1bd7a5300a614471d upstream.
Unknown operation numbers are caught in nfsd4_decode_compound() which
sets op->opnum to OP_ILLEGAL and op->status to nfserr_op_illegal. The
error causes the main loop in nfsd4_proc_compound() to skip most
processing. But nfsd4_proc_compound also peeks ahead at the next
operation in one case and doesn't take similar precautions there.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/nfsd')
| -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 eebccfe..9a959de 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1111,7 +1111,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 |