nfsd41: Create the recovery entry for the NFSv4.1 client
Subsystems (2)
PATCH 1/1 nfsd41: Create the recovery entry for the NFSv4.1 client
--- fs/nfsd/nfs4state.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
fs/nfsd/nfs4state.c +3 -1
@@ -2487,8 +2487,10 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf }memcpy (&open->op_stateid, &stp->st_stateid,sizeof (stateid_t)); -if (nfsd4_has_session (&resp->cstate)) +if (nfsd4_has_session (&resp->cstate)) { open->op_stateowner->so_confirmed =1 ; +nfsd4_create_clid_dir (open->op_stateowner->so_client); + }/* * Attempt to hand out a delegation. No error return, because the
Signature · 1 line
1.5.4.3
PATCH 1/1 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.
--- fs/nfsd/nfs4xdr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/nfsd/nfs4xdr.c +1 -1
@@ -1442,7 +1442,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) } op->opnum =ntohl (*argp->p++); -if (op->opnum >=OP_ACCESS && op->opnum < ops->nops) +if (op->opnum >=OP_ACCESS && op->opnum <=LAST_NFS4_OP ) op->status = ops->decoders[op->opnum](argp, &op->u);else { op->opnum =OP_ILLEGAL ;
Signature · 1 line
1.5.4.3
Re: [PATCH] nfsd41: nfsd4_decode_compound() does not recognize all ops
Quoted 9 lines · Ricardo Labiaga
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 innfsd4_decode_compoundto 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.
Thanks. So the effect of this was to return an OP_ILLEGAL in some cases where we should have been returning a NOTSUPP error?
--b.
Quoted 22 lines
Signed-off-by Ricardo Labiaga <[email protected]>--- fs/nfsd/nfs4xdr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)fs/nfsd/nfs4xdr.c +1
-1@@ -1442,7 +1442,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) } op->opnum =ntohl (*argp->p++); -if (op->opnum >=OP_ACCESS && op->opnum < ops->nops) +if (op->opnum >=OP_ACCESS && op->opnum <=LAST_NFS4_OP ) op->status = ops->decoders[op->opnum](argp, &op->u);else { op->opnum =OP_ILLEGAL ;Signature · 1 line
1.5.4.3
Re: [PATCH] nfsd41: nfsd4_decode_compound() does not recognize allops
That's right.
- ricardo
Quoted 39 lines · J. Bruce Fields
Quoted 9 lines · Ricardo Labiaga
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 innfsd4_decode_compoundto 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.Thanks. So the effect of this was to return an
OP_ILLEGALin some cases where we should have been returning a NOTSUPP error?--b.
Quoted 23 lines
Signed-off-by Ricardo Labiaga <[email protected]>---
fs/nfsd/nfs4xdr.c| 2 +-1 files changed, 1 insertions(+), 1 deletions(-)fs/nfsd/nfs4xdr.c +1
-1@@ -1442,7 +1442,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) } op->opnum =ntohl (*argp->p++); -if (op->opnum >=OP_ACCESS && op->opnum < ops->nops) +if (op->opnum >=OP_ACCESS && op->opnum <=LAST_NFS4_OP ) op->status = ops->decoders[op->opnum](argp, &op->u);else {op->opnum = OP_ILLEGAL;Signature · 1 line
1.5.4.3
Quoted 1 line · Ricardo Labiaga
Signed-off-by Ricardo Labiaga <[email protected]>
Thanks, looks right--applied.
--b.
Quoted 23 lines
--- fs/nfsd/nfs4state.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)fs/nfsd/nfs4state.c +3
-1@@ -2487,8 +2487,10 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf }memcpy (&open->op_stateid, &stp->st_stateid,sizeof (stateid_t)); -if (nfsd4_has_session (&resp->cstate)) +if (nfsd4_has_session (&resp->cstate)) { open->op_stateowner->so_confirmed =1 ; +nfsd4_create_clid_dir (open->op_stateowner->so_client); + }/* * Attempt to hand out a delegation. No error return, because the Signature · 1 line
1.5.4.3