From: J. Bruce Fields Date: Wed, 22 Oct 2014 18:46:29 +0000 (-0400) Subject: nfsd4: fix crash on unknown operation number X-Git-Tag: v3.4.106~80 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=971918b8e4fbe202b6be1fa1a31f1991c08164dc;p=platform%2Fkernel%2Flinux-stable.git 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 Signed-off-by: Zefan Li --- diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 22beaff..b2ce878 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