[PATCH 6.6.y] iomap: Fix possible overflow condition in iomap_write_delalloc_scan

Rajani Kantha posted 1 patch 2 weeks, 2 days ago
There is a newer version of this series
fs/iomap/buffered-io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH 6.6.y] iomap: Fix possible overflow condition in iomap_write_delalloc_scan
Posted by Rajani Kantha 2 weeks, 2 days ago
From: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>

[ Upstream commit eee2d2e6ea5550118170dbd5bb1316ceb38455fb ]

folio_next_index() returns an unsigned long value which left shifted
by PAGE_SHIFT could possibly cause an overflow on 32-bit system. Instead
use folio_pos(folio) + folio_size(folio), which does this correctly.

Suggested-by: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Rajani Kantha <681739313@139.com>
---
 fs/iomap/buffered-io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 70e246f7e8fe..e4f58d1e12d4 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -903,7 +903,7 @@ static int iomap_write_delalloc_scan(struct inode *inode,
 			 * the end of this data range, not the end of the folio.
 			 */
 			*punch_start_byte = min_t(loff_t, end_byte,
-					folio_next_index(folio) << PAGE_SHIFT);
+					folio_pos(folio) + folio_size(folio));
 		}
 
 		/* move offset to start of next folio in range */
-- 
2.34.1
Re: [PATCH 6.6.y] iomap: Fix possible overflow condition in iomap_write_delalloc_scan
Posted by Rajani Kantha 2 weeks, 1 day ago
Hello,
Sorry, I accidentally wrote 'PATCH 6.6' as' PATCH 6.1 ', please ignore this series.
I will resend the correct one, thanks.
Re: [PATCH 6.6.y] iomap: Fix possible overflow condition in iomap_write_delalloc_scan
Posted by Rajani Kantha 2 weeks, 2 days ago