diff options
| author | Mi Jinlong <mijinlong@cn.fujitsu.com> | 2011-04-27 09:09:58 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-04-29 20:47:55 -0400 |
| commit | 868b89c3dc25eec03985b31ff070e8f73c818980 (patch) | |
| tree | f3ef1fc3c5d7414195af355fddd956d81fc81fc6 /fs/nfsd | |
| parent | b7c66360dc34e64742edabf4dc410070aa883119 (diff) | |
| download | blackbird-obmc-linux-868b89c3dc25eec03985b31ff070e8f73c818980.tar.gz blackbird-obmc-linux-868b89c3dc25eec03985b31ff070e8f73c818980.zip | |
nfsd41: compare request's opcnt with session's maxops at nfsd4_sequence
Make sure nfs server errors out if request contains more ops
than channel allows.
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
[bfields@redhat.com: use helper function]
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6dbaa379c863..3196dc388578 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1724,6 +1724,13 @@ static void nfsd4_sequence_check_conn(struct nfsd4_conn *new, struct nfsd4_sessi return; } +static bool nfsd4_session_too_many_ops(struct svc_rqst *rqstp, struct nfsd4_session *session) +{ + struct nfsd4_compoundargs *args = rqstp->rq_argp; + + return args->opcnt > session->se_fchannel.maxops; +} + __be32 nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, @@ -1752,6 +1759,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, if (!session) goto out; + status = nfserr_too_many_ops; + if (nfsd4_session_too_many_ops(rqstp, session)) + goto out; + status = nfserr_badslot; if (seq->slotid >= session->se_fchannel.maxreqs) goto out; |
