NFSv4: Check the return value of decode_compound_hdr_arg()
If decode_compound_hdr_arg() returns a resource error, then we cannot proceed to process the callback. Return a 'GARBAGE_ARGS' rpc-level error to the caller instead. If, however, the minor version field is incorrect, then we need to propagate the resulting NFS4ERR_MINOR_VERS_MISMATCH error back as the compound status field (setting the nops field to 0). Finally, if encode_compound_hdr_res() returns an error, we need to return an RPC_SYSTEM_ERR to the caller. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
38def50fab
commit
3a6258e1fb
|
@ -401,12 +401,12 @@ static __be32 process_op(struct svc_rqst *rqstp,
|
||||||
*/
|
*/
|
||||||
static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *resp)
|
static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *resp)
|
||||||
{
|
{
|
||||||
struct cb_compound_hdr_arg hdr_arg;
|
struct cb_compound_hdr_arg hdr_arg = { 0 };
|
||||||
struct cb_compound_hdr_res hdr_res;
|
struct cb_compound_hdr_res hdr_res = { NULL };
|
||||||
struct xdr_stream xdr_in, xdr_out;
|
struct xdr_stream xdr_in, xdr_out;
|
||||||
__be32 *p;
|
__be32 *p;
|
||||||
__be32 status;
|
__be32 status;
|
||||||
unsigned int nops = 1;
|
unsigned int nops = 0;
|
||||||
|
|
||||||
dprintk("%s: start\n", __FUNCTION__);
|
dprintk("%s: start\n", __FUNCTION__);
|
||||||
|
|
||||||
|
@ -415,20 +415,20 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r
|
||||||
p = (__be32*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len);
|
p = (__be32*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len);
|
||||||
xdr_init_encode(&xdr_out, &rqstp->rq_res, p);
|
xdr_init_encode(&xdr_out, &rqstp->rq_res, p);
|
||||||
|
|
||||||
decode_compound_hdr_arg(&xdr_in, &hdr_arg);
|
status = decode_compound_hdr_arg(&xdr_in, &hdr_arg);
|
||||||
|
if (status == __constant_htonl(NFS4ERR_RESOURCE))
|
||||||
|
return rpc_garbage_args;
|
||||||
|
|
||||||
hdr_res.taglen = hdr_arg.taglen;
|
hdr_res.taglen = hdr_arg.taglen;
|
||||||
hdr_res.tag = hdr_arg.tag;
|
hdr_res.tag = hdr_arg.tag;
|
||||||
hdr_res.nops = NULL;
|
if (encode_compound_hdr_res(&xdr_out, &hdr_res) != 0)
|
||||||
encode_compound_hdr_res(&xdr_out, &hdr_res);
|
return rpc_system_err;
|
||||||
|
|
||||||
for (;;) {
|
while (status == 0 && nops != hdr_arg.nops) {
|
||||||
status = process_op(rqstp, &xdr_in, argp, &xdr_out, resp);
|
status = process_op(rqstp, &xdr_in, argp, &xdr_out, resp);
|
||||||
if (status != 0)
|
|
||||||
break;
|
|
||||||
if (nops == hdr_arg.nops)
|
|
||||||
break;
|
|
||||||
nops++;
|
nops++;
|
||||||
}
|
}
|
||||||
|
|
||||||
*hdr_res.status = status;
|
*hdr_res.status = status;
|
||||||
*hdr_res.nops = htonl(nops);
|
*hdr_res.nops = htonl(nops);
|
||||||
dprintk("%s: done, status = %u\n", __FUNCTION__, ntohl(status));
|
dprintk("%s: done, status = %u\n", __FUNCTION__, ntohl(status));
|
||||||
|
|
Loading…
Reference in a new issue