From: Dan Aloni <dan.aloni@vastdata.com>
To: trondmy@kernel.org
Cc: Anna Schumaker <Anna.Schumaker@netapp.com>, linux-nfs@vger.kernel.org
Subject: [PATCH] NFSD: trim reads past NFS_OFFSET_MAX
Date: Fri, 21 Jan 2022 20:50:23 +0200 [thread overview]
Message-ID: <20220121185023.260128-1-dan.aloni@vastdata.com> (raw)
In-Reply-To: <fa9974724216c43f9bdb3fd39555d398fde11e59.camel@hammerspace.com>
Due to change 8cfb9015280d ("NFS: Always provide aligned buffers to the
RPC read layers"), a read of 0xfff is aligned up to server rsize of
0x1000.
As a result, in a test where the server has a file of size
0x7fffffffffffffff, and the client tries to read from the offset
0x7ffffffffffff000, the read causes loff_t overflow in the server and it
returns an NFS code of EINVAL to the client. The client as a result
indefinitely retries the request.
This fixes the issue at server side by trimming reads past NFS_OFFSET_MAX.
Fixes: 8cfb9015280d ("NFS: Always provide aligned buffers to the RPC read layers")
Signed-off-by: Dan Aloni <dan.aloni@vastdata.com>
---
fs/nfsd/vfs.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 738d564ca4ce..754f4e9ff4a2 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1046,6 +1046,10 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
__be32 err;
trace_nfsd_read_start(rqstp, fhp, offset, *count);
+
+ if (unlikely(offset + *count > NFS_OFFSET_MAX))
+ *count = NFS_OFFSET_MAX - offset;
+
err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf);
if (err)
return err;
--
2.23.0
next prev parent reply other threads:[~2022-01-21 18:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 18:00 [PATCH] NFS: Always provide aligned buffers to the RPC read layers trondmy
2022-01-18 19:26 ` Dan Aloni
2022-01-18 19:33 ` [PATCH] NFS: fix an infinite request retry in an off-by-one last page read Dan Aloni
2022-01-18 19:43 ` Trond Myklebust
2022-01-21 18:50 ` Dan Aloni [this message]
2022-01-21 22:32 ` [PATCH] NFSD: trim reads past NFS_OFFSET_MAX Chuck Lever III
2022-01-22 12:47 ` Dan Aloni
2022-01-22 17:05 ` Chuck Lever III
2022-01-22 18:27 ` Trond Myklebust
2022-01-22 20:15 ` Chuck Lever III
2022-01-22 20:30 ` Trond Myklebust
2022-01-23 17:35 ` Chuck Lever III
2022-01-22 19:01 ` Dan Aloni
2022-01-22 20:33 ` Chuck Lever III
2022-01-22 12:49 ` [PATCH v2] NFSD: trim reads past NFS_OFFSET_MAX and fix NFSv3 check Dan Aloni
2022-01-22 17:37 ` Chuck Lever III
2022-01-23 6:29 ` Dan Aloni
2022-01-23 9:50 ` [PATCH v3] " Dan Aloni
2022-01-23 15:29 ` Trond Myklebust
2022-01-23 17:03 ` Chuck Lever III
2022-01-26 16:23 ` 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=20220121185023.260128-1-dan.aloni@vastdata.com \
--to=dan.aloni@vastdata.com \
--cc=Anna.Schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trondmy@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