aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-10-22 14:46:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 09:00:09 -0800
commit1cb5aec0a09d3b2f168b8c9edd411c884c33c751 (patch)
tree56e0110afa235d54764ed68f77dac076d4993743
parent7134fa39fd80928b241d3f0f4a322e873834309d (diff)
downloadlinux-yocto-1cb5aec0a09d3b2f168b8c9edd411c884c33c751.tar.gz
linux-yocto-1cb5aec0a09d3b2f168b8c9edd411c884c33c751.tar.bz2
linux-yocto-1cb5aec0a09d3b2f168b8c9edd411c884c33c751.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfsd/nfs4proc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index f23a6ca37504..86f5d3e474bf 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1243,7 +1243,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