block: Fix bvec_set_folio() for very large folios

[ Upstream commit 5e223e06ee7c6d8f630041a0645ac90e39a42cc6 ]

Similarly to 26064d3e2b4d ("block: fix adding folio to bio"), if
we attempt to add a folio that is larger than 4GB, we'll silently
truncate the offset and len.  Widen the parameters to size_t, assert
that the length is less than 4GB and set the first page that contains
the interesting data rather than the first page of the folio.

Fixes: 26db5ee158 (block: add a bvec_set_folio helper)
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20250612144255.2850278-1-willy@infradead.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle)
2025-06-12 15:42:53 +01:00
committed by Greg Kroah-Hartman
parent 9e263d9459
commit c9a2e81583

View File

@@ -57,9 +57,12 @@ static inline void bvec_set_page(struct bio_vec *bv, struct page *page,
* @offset: offset into the folio * @offset: offset into the folio
*/ */
static inline void bvec_set_folio(struct bio_vec *bv, struct folio *folio, static inline void bvec_set_folio(struct bio_vec *bv, struct folio *folio,
unsigned int len, unsigned int offset) size_t len, size_t offset)
{ {
bvec_set_page(bv, &folio->page, len, offset); unsigned long nr = offset / PAGE_SIZE;
WARN_ON_ONCE(len > UINT_MAX);
bvec_set_page(bv, folio_page(folio, nr), len, offset % PAGE_SIZE);
} }
/** /**