diff options
| author |   Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 16:52:52 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2021-07-06 20:14:43 -0400 |
| commit | bc3665fd718b325cfff3abd383b00d1a87e028dc (patch) | |
| tree | 586b0ae8708f908d6e5b36944803b6fda804a785 /fs | |
| parent | lockd: Update the NLMv4 nlm_res arguments decoder to use struct xdr_stream (diff) | |
| download | linux-dev-bc3665fd718b325cfff3abd383b00d1a87e028dc.tar.xz linux-dev-bc3665fd718b325cfff3abd383b00d1a87e028dc.zip | |
lockd: Update the NLMv4 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')
| -rw-r--r-- | fs/lockd/xdr4.c | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index 6bd3bfb69ed7..2dbf82c2726b 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c @@ -310,6 +310,32 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p) } int +nlm4svc_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 nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p) { struct nlm_res *resp = rqstp->rq_resp; @@ -377,19 +403,6 @@ nlm4svc_decode_notify(struct svc_rqst *rqstp, __be32 *p) } int -nlm4svc_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 nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p) { return xdr_ressize_check(rqstp, p); |