diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-10-22 22:46:29 +0400 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-02-02 12:05:04 +0300 |
| commit | 971918b8e4fbe202b6be1fa1a31f1991c08164dc (patch) | |
| tree | 0aa76c613dd2668729bf356bc20976e34181c19b /fs/nfsd | |
| parent | 6b91578a5af27dbba3c9b26bc918165eefcff7d3 (diff) | |
| download | linux-971918b8e4fbe202b6be1fa1a31f1991c08164dc.tar.xz | |
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: Zefan Li <lizefan@huawei.com>
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 22beaff3544a..b2ce878080be 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1132,7 +1132,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 |