Skip to content

Commit

Permalink
nfsd41: compare request's opcnt with session's maxops at nfsd4_sequence
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mi Jinlong authored and J. Bruce Fields committed Apr 30, 2011
1 parent b7c6636 commit 868b89c
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 868b89c

Please sign in to comment.