This is a note to let you know that I've just added the patch titled
iomap: avoid avoid truncating 64-bit offset to 32 bits
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iomap-avoid-avoid-truncating-64-bit-offset-to-32-bit.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 4e3b2335478c5edd3f61de3a93822bf780c6b961
Author: Marco Nelissen <marco.nelissen@xxxxxxxxx>
Date: Wed Jan 8 20:11:50 2025 -0800
iomap: avoid avoid truncating 64-bit offset to 32 bits
[ Upstream commit c13094b894de289514d84b8db56d1f2931a0bade ]
on 32-bit kernels, iomap_write_delalloc_scan() was inadvertently using a
32-bit position due to folio_next_index() returning an unsigned long.
This could lead to an infinite loop when writing to an xfs filesystem.
Signed-off-by: Marco Nelissen <marco.nelissen@xxxxxxxxx>
Link: https://lore.kernel.org/r/20250109041253.2494374-1-marco.nelissen@xxxxxxxxx
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index a05ee2cbb7793..e7e6701806ad2 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1095,7 +1095,7 @@ static int iomap_write_delalloc_scan(struct inode *inode,
}
/* move offset to start of next folio in range */
- start_byte = folio_next_index(folio) << PAGE_SHIFT;
+ start_byte = folio_pos(folio) + folio_size(folio);
folio_unlock(folio);
folio_put(folio);
}
