diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-10-22 14:46:29 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-13 19:02:59 +0100 |
| commit | 613a5ea57f0ed08228311a46b84155986949c7d4 (patch) | |
| tree | 3b3db1f7c7bcfc613168c21d7cdf37d1ef742336 | |
| parent | de351259edc887ab6cc08b74e27ea748ad532f4f (diff) | |
| download | lwn-613a5ea57f0ed08228311a46b84155986949c7d4.tar.gz lwn-613a5ea57f0ed08228311a46b84155986949c7d4.zip | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 |