From: Marco Nelissen <marco.nelissen@gmail.com>
Date: Thu, 2 Jan 2025 19:04:11 +0000 (-0800)
Subject: filemap: avoid truncating 64-bit offset to 32 bits
X-Git-Tag: v6.13~27^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f505e6c91e7a22d10316665a86d79f84d9f0ba76;p=thirdparty%2Flinux.git

filemap: avoid truncating 64-bit offset to 32 bits

On 32-bit kernels, folio_seek_hole_data() was inadvertently truncating a
64-bit value to 32 bits, leading to a possible infinite loop when writing
to an xfs filesystem.

Link: https://lkml.kernel.org/r/20250102190540.1356838-1-marco.nelissen@gmail.com
Fixes: 54fa39ac2e00 ("iomap: use mapping_seek_hole_data")
Signed-off-by: Marco Nelissen <marco.nelissen@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/filemap.c b/mm/filemap.c
index 33b60d448fca5..118fa1e0bafe8 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2996,7 +2996,7 @@ static inline loff_t folio_seek_hole_data(struct xa_state *xas,
 		if (ops->is_partially_uptodate(folio, offset, bsz) ==
 							seek_data)
 			break;
-		start = (start + bsz) & ~(bsz - 1);
+		start = (start + bsz) & ~((u64)bsz - 1);
 		offset += bsz;
 	} while (offset < folio_size(folio));
 unlock: