From patchwork Wed Apr 27 01:09:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mi Jinlong X-Patchwork-Id: 735101 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3R18BbP031758 for ; Wed, 27 Apr 2011 01:08:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752976Ab1D0BIJ (ORCPT ); Tue, 26 Apr 2011 21:08:09 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:55697 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752504Ab1D0BII (ORCPT ); Tue, 26 Apr 2011 21:08:08 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 7435B17008D; Wed, 27 Apr 2011 09:08:06 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p3R185YZ003960; Wed, 27 Apr 2011 09:08:06 +0800 Received: from [127.0.0.1] ([10.167.225.24]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011042709083366-154393 ; Wed, 27 Apr 2011 09:08:33 +0800 Message-ID: <4DB76CE6.9080404@cn.fujitsu.com> Date: Wed, 27 Apr 2011 09:09:58 +0800 From: Mi Jinlong User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: "J. Bruce Fields" CC: NFS Subject: [PATCH] nfsd41: compare request's opcnt with session's maxops at nfsd4_sequence X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-27 09:08:33, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-27 09:08:34, Serialize complete at 2011-04-27 09:08:34 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 27 Apr 2011 01:08:11 +0000 (UTC) Make sure nfs server can distinguish request contains more ops than channel allowed. Signed-off-by: Mi Jinlong --- fs/nfsd/nfs4state.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fbde6f7..4f9fc68 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1749,6 +1749,11 @@ nfsd4_sequence(struct svc_rqst *rqstp, if (!session) goto out; + status = nfserr_too_many_ops; + if (((struct nfsd4_compoundargs *)rqstp->rq_argp)->opcnt > + session->se_fchannel.maxops) + goto out; + status = nfserr_badslot; if (seq->slotid >= session->se_fchannel.maxreqs) goto out;