diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 23:51:34 +0300 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2021-07-07 03:14:42 +0300 |
| commit | 137e05e2f735f696e117553f7fa5ef8fb09953e1 (patch) | |
| tree | f985a7f8bcae43c05d9e1d7d69020e9738196a6c /fs/lockd/xdr.c | |
| parent | 16ddcabe6240c4fb01c97f6fce6c35ddf8626ad5 (diff) | |
| download | linux-137e05e2f735f696e117553f7fa5ef8fb09953e1.tar.xz | |
lockd: Update the NLMv1 SM_NOTIFY arguments decoder to use struct xdr_stream
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/xdr.c')
| -rw-r--r-- | fs/lockd/xdr.c | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index 911b6377a6da..421613170e5f 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c @@ -314,6 +314,32 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p) } int +nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p) +{ + struct xdr_stream *xdr = &rqstp->rq_arg_stream; + struct nlm_reboot *argp = rqstp->rq_argp; + u32 len; + + if (xdr_stream_decode_u32(xdr, &len) < 0) + return 0; + if (len > SM_MAXSTRLEN) + return 0; + p = xdr_inline_decode(xdr, len); + if (!p) + return 0; + argp->len = len; + argp->mon = (char *)p; + if (xdr_stream_decode_u32(xdr, &argp->state) < 0) + return 0; + p = xdr_inline_decode(xdr, SM_PRIV_SIZE); + if (!p) + return 0; + memcpy(&argp->priv.data, p, sizeof(argp->priv.data)); + + return 1; +} + +int nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p) { struct nlm_res *resp = rqstp->rq_resp; @@ -381,19 +407,6 @@ nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p) } int -nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p) -{ - struct nlm_reboot *argp = rqstp->rq_argp; - - if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN))) - return 0; - argp->state = ntohl(*p++); - memcpy(&argp->priv.data, p, sizeof(argp->priv.data)); - p += XDR_QUADLEN(SM_PRIV_SIZE); - return xdr_argsize_check(rqstp, p); -} - -int nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p) { return xdr_ressize_check(rqstp, p); |