From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v1 24/29] lockd: Update the NLMv4 SHARE arguments decoder to use struct xdr_stream
Date: Mon, 03 May 2021 11:25:15 -0400 [thread overview]
Message-ID: <162005551543.23028.15623675296934341189.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <162005520101.23028.15766816408658851498.stgit@klimt.1015granger.net>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/lockd/xdr4.c | 99 ++++++++++++++-----------------------------------------
1 file changed, 26 insertions(+), 73 deletions(-)
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index 2dbf82c2726b..e6bab1d1e41f 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -42,37 +42,6 @@ loff_t_to_s64(loff_t offset)
return res;
}
-/*
- * XDR functions for basic NLM types
- */
-static __be32 *
-nlm4_decode_cookie(__be32 *p, struct nlm_cookie *c)
-{
- unsigned int len;
-
- len = ntohl(*p++);
-
- if(len==0)
- {
- c->len=4;
- memset(c->data, 0, 4); /* hockeypux brain damage */
- }
- else if(len<=NLM_MAXCOOKIELEN)
- {
- c->len=len;
- memcpy(c->data, p, len);
- p+=XDR_QUADLEN(len);
- }
- else
- {
- dprintk("lockd: bad cookie size %d (only cookies under "
- "%d bytes are supported.)\n",
- len, NLM_MAXCOOKIELEN);
- return NULL;
- }
- return p;
-}
-
static __be32 *
nlm4_encode_cookie(__be32 *p, struct nlm_cookie *c)
{
@@ -82,20 +51,6 @@ nlm4_encode_cookie(__be32 *p, struct nlm_cookie *c)
return p;
}
-static __be32 *
-nlm4_decode_fh(__be32 *p, struct nfs_fh *f)
-{
- memset(f->data, 0, sizeof(f->data));
- f->size = ntohl(*p++);
- if (f->size > NFS_MAXFHSIZE) {
- dprintk("lockd: bad fhandle size %d (should be <=%d)\n",
- f->size, NFS_MAXFHSIZE);
- return NULL;
- }
- memcpy(f->data, p, f->size);
- return p + XDR_QUADLEN(f->size);
-}
-
/*
* NLM file handles are defined by specification to be a variable-length
* XDR opaque no longer than 1024 bytes. However, this implementation
@@ -122,15 +77,6 @@ svcxdr_decode_fhandle(struct xdr_stream *xdr, struct nfs_fh *fh)
return true;
}
-/*
- * Encode and decode owner handle
- */
-static __be32 *
-nlm4_decode_oh(__be32 *p, struct xdr_netobj *oh)
-{
- return xdr_decode_netobj(p, oh);
-}
-
static bool
svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)
{
@@ -335,35 +281,42 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)
return 1;
}
-int
-nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
-{
- struct nlm_res *resp = rqstp->rq_resp;
-
- if (!(p = nlm4_encode_testres(p, resp)))
- return 0;
- return xdr_ressize_check(rqstp, p);
-}
-
int
nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)
{
+ struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_lock *lock = &argp->lock;
memset(lock, 0, sizeof(*lock));
locks_init_lock(&lock->fl);
- lock->svid = ~(u32) 0;
+ lock->svid = ~(u32)0;
- if (!(p = nlm4_decode_cookie(p, &argp->cookie))
- || !(p = xdr_decode_string_inplace(p, &lock->caller,
- &lock->len, NLM_MAXSTRLEN))
- || !(p = nlm4_decode_fh(p, &lock->fh))
- || !(p = nlm4_decode_oh(p, &lock->oh)))
+ if (!svcxdr_decode_cookie(xdr, &argp->cookie))
return 0;
- argp->fsm_mode = ntohl(*p++);
- argp->fsm_access = ntohl(*p++);
- return xdr_argsize_check(rqstp, p);
+ if (!svcxdr_decode_string(xdr, &lock->caller, &lock->len))
+ return 0;
+ if (!svcxdr_decode_fhandle(xdr, &lock->fh))
+ return 0;
+ if (!svcxdr_decode_owner(xdr, &lock->oh))
+ return 0;
+ /* XXX: Range checks are missing in the original code */
+ if (xdr_stream_decode_u32(xdr, &argp->fsm_mode) < 0)
+ return 0;
+ if (xdr_stream_decode_u32(xdr, &argp->fsm_access) < 0)
+ return 0;
+
+ return 1;
+}
+
+int
+nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
+{
+ struct nlm_res *resp = rqstp->rq_resp;
+
+ if (!(p = nlm4_encode_testres(p, resp)))
+ return 0;
+ return xdr_ressize_check(rqstp, p);
}
int
next prev parent reply other threads:[~2021-05-03 15:25 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 15:22 [PATCH v1 00/29] server-side lockd XDR overhaul Chuck Lever
2021-05-03 15:22 ` [PATCH v1 01/29] lockd: Remove stale comments Chuck Lever
2021-05-03 15:22 ` [PATCH v1 02/29] lockd: Create a simplified .vs_dispatch method for NLM requests Chuck Lever
2021-05-03 15:23 ` [PATCH v1 03/29] lockd: Common NLM XDR helpers Chuck Lever
2021-05-03 15:23 ` [PATCH v1 04/29] lockd: Update the NLMv1 void argument decoder to use struct xdr_stream Chuck Lever
2021-05-03 15:23 ` [PATCH v1 05/29] lockd: Update the NLMv1 TEST arguments " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 06/29] lockd: Update the NLMv1 LOCK " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 07/29] lockd: Update the NLMv1 CANCEL " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 08/29] lockd: Update the NLMv1 UNLOCK " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 09/29] lockd: Update the NLMv1 nlm_res " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 10/29] lockd: Update the NLMv1 SM_NOTIFY " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 11/29] lockd: Update the NLMv1 SHARE " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 12/29] lockd: Update the NLMv1 FREE_ALL " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 13/29] lockd: Update the NLMv1 void results encoder " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 14/29] lockd: Update the NLMv1 TEST " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 15/29] lockd: Update the NLMv1 nlm_res " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 16/29] lockd: Update the NLMv1 SHARE " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 17/29] lockd: Update the NLMv4 void arguments decoder " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 18/29] lockd: Update the NLMv4 TEST " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 19/29] lockd: Update the NLMv4 LOCK " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 20/29] lockd: Update the NLMv4 CANCEL " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 21/29] lockd: Update the NLMv4 UNLOCK " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 22/29] lockd: Update the NLMv4 nlm_res " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 23/29] lockd: Update the NLMv4 SM_NOTIFY " Chuck Lever
2021-05-03 15:25 ` Chuck Lever [this message]
2021-05-03 15:25 ` [PATCH v1 25/29] lockd: Update the NLMv4 FREE_ALL " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 26/29] lockd: Update the NLMv4 void results encoder " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 27/29] lockd: Update the NLMv4 TEST " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 28/29] lockd: Update the NLMv4 nlm_res " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 29/29] lockd: Update the NLMv4 SHARE " Chuck Lever
2021-05-03 17:59 ` [PATCH v1 00/29] server-side lockd XDR overhaul J. Bruce Fields
2021-05-03 18:02 ` Chuck Lever III
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162005551543.23028.15623675296934341189.stgit@klimt.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).