summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2009-04-01 09:23:27 -0400
committerBenny Halevy <bhalevy@panasas.com>2009-06-17 14:11:39 -0700
commit281fe15dc1d6ad46992f18b7a6644269ec5f7138 (patch)
tree168baccd85401f61433c99b3f14b5b3ff833ff1d /fs/nfs
parent4aece6a19cf7f474f15eb861ba74db4479884ce3 (diff)
downloadlinux-stable-281fe15dc1d6ad46992f18b7a6644269ec5f7138.tar.gz
linux-stable-281fe15dc1d6ad46992f18b7a6644269ec5f7138.tar.bz2
linux-stable-281fe15dc1d6ad46992f18b7a6644269ec5f7138.zip
nfs41: verify CB_SEQUENCE position in callback compound
CB_SEQUENCE must appear first in the callback compound RPC. If it is not the first operation NFS4ERR_SEQUENCE_POS must be returned. If the first operation ni the CB_COMPOUND is not CB_SEQUENCE then NFS4ERR_OP_NOT_IN_SESSION must be returned. Signed-off-by: Ricardo Labiaga <ricardo.labiaga@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: refactor op preprocessing out of process_op] Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/callback_xdr.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 56a3cc510107..537f21da6e5f 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -521,6 +521,14 @@ out:
static __be32
preprocess_nfs41_op(int nop, unsigned int op_nr, struct callback_op **op)
{
+ if (op_nr == OP_CB_SEQUENCE) {
+ if (nop != 0)
+ return htonl(NFS4ERR_SEQUENCE_POS);
+ } else {
+ if (nop == 0)
+ return htonl(NFS4ERR_OP_NOT_IN_SESSION);
+ }
+
switch (op_nr) {
case OP_CB_GETATTR:
case OP_CB_RECALL: