From: Julian Sun <sunjunchao2870@gmail.com>
To: linux-fsdevel@vger.kernel.org
Cc: chandan.babu@oracle.com, djwong@kernel.org,
viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz,
hch@lst.de, Julian Sun <sunjunchao2870@gmail.com>,
syzbot+296b1c84b9cbf306e5a0@syzkaller.appspotmail.com,
Dave Chinner <david@fromorbit.com>
Subject: [PATCH v2] xfs: do not unshare any blocks beyond eof
Date: Fri, 27 Sep 2024 14:53:44 +0800 [thread overview]
Message-ID: <20240927065344.2628691-1-sunjunchao2870@gmail.com> (raw)
Attempting to unshare extents beyond EOF will trigger
the need zeroing case, which in turn triggers a warning.
Therefore, let's skip the unshare process if blocks are
beyond EOF.
This patch passed the xfstests using './check -g quick', without
causing any additional failure
Reported-and-tested-by: syzbot+296b1c84b9cbf306e5a0@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=296b1c84b9cbf306e5a0
Fixes: 32a38a499104 ("iomap: use write_begin to read pages to unshare")
Inspired-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Julian Sun <sunjunchao2870@gmail.com>
---
fs/xfs/xfs_iomap.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 72c981e3dc92..81a0514b8652 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -976,6 +976,7 @@ xfs_buffered_write_iomap_begin(
int error = 0;
unsigned int lockmode = XFS_ILOCK_EXCL;
u64 seq;
+ xfs_fileoff_t eof_fsb;
if (xfs_is_shutdown(mp))
return -EIO;
@@ -1016,6 +1017,13 @@ xfs_buffered_write_iomap_begin(
if (eof)
imap.br_startoff = end_fsb; /* fake hole until the end */
+ /* Don't try to unshare any blocks beyond EOF. */
+ eof_fsb = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
+ if (flags & IOMAP_UNSHARE && end_fsb > eof_fsb) {
+ xfs_trim_extent(&imap, offset_fsb, eof_fsb - offset_fsb);
+ end_fsb = eof_fsb;
+ }
+
/* We never need to allocate blocks for zeroing or unsharing a hole. */
if ((flags & (IOMAP_UNSHARE | IOMAP_ZERO)) &&
imap.br_startoff > offset_fsb) {
@@ -1030,7 +1038,6 @@ xfs_buffered_write_iomap_begin(
*/
if ((flags & IOMAP_ZERO) && imap.br_startoff <= offset_fsb &&
isnullstartblock(imap.br_startblock)) {
- xfs_fileoff_t eof_fsb = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
if (offset_fsb >= eof_fsb)
goto convert_delay;
--
2.39.2
next reply other threads:[~2024-09-27 6:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-27 6:53 Julian Sun [this message]
2024-09-28 4:43 ` [PATCH v2] xfs: do not unshare any blocks beyond eof Darrick J. Wong
2024-09-29 8:30 ` Julian Sun
2024-09-29 23:23 ` Dave Chinner
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=20240927065344.2628691-1-sunjunchao2870@gmail.com \
--to=sunjunchao2870@gmail.com \
--cc=brauner@kernel.org \
--cc=chandan.babu@oracle.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=syzbot+296b1c84b9cbf306e5a0@syzkaller.appspotmail.com \
--cc=viro@zeniv.linux.org.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.