Skip to content

Commit

Permalink
iomap: Fix possible overflow condition in iomap_write_delalloc_scan
Browse files Browse the repository at this point in the history
[ Upstream commit eee2d2e ]

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: Sasha Levin <sashal@kernel.org>
  • Loading branch information
riteshharjani authored and gregkh committed Sep 23, 2023
1 parent 2ba0bab commit 5c281b0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/iomap/buffered-io.c
Expand Up @@ -927,7 +927,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 */
Expand Down

0 comments on commit 5c281b0

Please sign in to comment.