diff options
author | Ricardo Labiaga <Ricardo.Labiaga@netapp.com> | 2009-12-11 22:10:49 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-01-13 09:42:26 -0500 |
commit | c551866e649bac66a5145d100f34086d6edb581e (patch) | |
tree | ff6362dc3d14841575a42d30fb605a178793dcb1 /fs/nfsd | |
parent | 7284ce6c9f6153d1777df5f310c959724d1bd446 (diff) |
nfsd41: nfsd4_decode_compound() does not recognize all ops
The server incorrectly assumes that the operations in the
array start with value 0. The first operation (OP_ACCESS)
has a value of 3, causing the check in nfsd4_decode_compound
to be off.
Instead of comparing that the operation number is less than
the number of elements in the array, the server should verify
that it is less than the maximum valid operation number
defined by LAST_NFS4_OP.
Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index a8587e90fd5a..4f14f0c0616f 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
@@ -1434,7 +1434,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) | |||
1434 | } | 1434 | } |
1435 | op->opnum = ntohl(*argp->p++); | 1435 | op->opnum = ntohl(*argp->p++); |
1436 | 1436 | ||
1437 | if (op->opnum >= OP_ACCESS && op->opnum < ops->nops) | 1437 | if (op->opnum >= OP_ACCESS && op->opnum <= LAST_NFS4_OP) |
1438 | op->status = ops->decoders[op->opnum](argp, &op->u); | 1438 | op->status = ops->decoders[op->opnum](argp, &op->u); |
1439 | else { | 1439 | else { |
1440 | op->opnum = OP_ILLEGAL; | 1440 | op->opnum = OP_ILLEGAL; |