From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v1 06/12] NFSD: Use xdr_inline_decode() to decode NFSv3 symlinks
Date: Mon, 12 Sep 2022 17:23:02 -0400 [thread overview]
Message-ID: <166301778198.89884.1973943063854884679.stgit@oracle-102.nfsv4.dev> (raw)
In-Reply-To: <166301759113.89884.7985359396842428444.stgit@oracle-102.nfsv4.dev>
Replace the check for buffer over/underflow with a helper that is
commonly used for this purpose. The helper also sets xdr->nwords
correctly after successfully linearizing the symlink argument into
the stream's scratch buffer.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/nfsd/nfs3xdr.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 0293b8d65f10..71e32cf28885 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -616,8 +616,6 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
{
struct nfsd3_symlinkargs *args = rqstp->rq_argp;
struct kvec *head = rqstp->rq_arg.head;
- struct kvec *tail = rqstp->rq_arg.tail;
- size_t remaining;
if (!svcxdr_decode_diropargs3(xdr, &args->ffh, &args->fname, &args->flen))
return false;
@@ -626,16 +624,10 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
if (xdr_stream_decode_u32(xdr, &args->tlen) < 0)
return false;
- /* request sanity */
- remaining = head->iov_len + rqstp->rq_arg.page_len + tail->iov_len;
- remaining -= xdr_stream_pos(xdr);
- if (remaining < xdr_align_size(args->tlen))
- return false;
-
- args->first.iov_base = xdr->p;
+ /* symlink_data */
args->first.iov_len = head->iov_len - xdr_stream_pos(xdr);
-
- return true;
+ args->first.iov_base = xdr_inline_decode(xdr, args->tlen);
+ return args->first.iov_base != NULL;
}
bool
next prev parent reply other threads:[~2022-09-12 21:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 21:22 [PATCH v1 00/12] Short NFSD clean-ups Chuck Lever
2022-09-12 21:22 ` [PATCH v1 01/12] SUNRPC: Optimize svc_process() Chuck Lever
2022-09-12 21:22 ` [PATCH v1 02/12] SUNRPC: Parametrize how much of argsize should be zeroed Chuck Lever
2022-09-12 21:22 ` [PATCH v1 03/12] NFSD: Reduce amount of struct nfsd4_compoundargs that needs clearing Chuck Lever
2022-09-12 21:22 ` [PATCH v1 04/12] SUNRPC: Clarify comment that documents svc_max_payload() Chuck Lever
2022-09-12 21:22 ` [PATCH v1 05/12] NFSD: Refactor common code out of dirlist helpers Chuck Lever
2022-09-12 21:23 ` Chuck Lever [this message]
2022-09-12 21:23 ` [PATCH v1 07/12] NFSD: Clean up WRITE arg decoders Chuck Lever
2022-09-12 21:23 ` [PATCH v1 08/12] SUNRPC: Fix typo in xdr_buf_subsegment's kdoc comment Chuck Lever
2022-09-12 21:23 ` [PATCH v1 09/12] NFSD: Clean up nfs4svc_encode_compoundres() Chuck Lever
2022-09-12 21:23 ` [PATCH v1 10/12] NFSD: Remove "inline" directives on op_rsize_bop helpers Chuck Lever
2022-09-12 21:23 ` [PATCH v1 11/12] NFSD: Remove unused nfsd4_compoundargs::cachetype field Chuck Lever
2022-09-12 21:23 ` [PATCH v1 12/12] NFSD: Pack struct nfsd4_compoundres Chuck Lever
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=166301778198.89884.1973943063854884679.stgit@oracle-102.nfsv4.dev \
--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