Skip to content

Commit 6438936

Browse files
adam900710axboe
authored andcommitted
block: reject zero length in bio_add_page()
The function bio_add_page() returns the number of bytes added to the bio, and if that failed it should return 0. However there is a special quirk, if a caller is passing a page with length 0, that function will always return 0 but with different results: - The page is added to the bio If there is enough bvec slot or the folio can be merged with the last bvec. The return value 0 is just the length passed in, which is also 0. - The page is not added to the bio If the page is not mergeable with the last bvec, or there is no bvec slot available. The return value 0 means page is not added into the bio. Unfortunately the caller is not able to distinguish the above two cases, and will treat the 0 return value as page addition failure. In that case, this can lead to the double releasing of the last page: - By the bio cleanup Which normally goes through every page of the bio, including the last page which is added into the bio. - By the caller Which believes the page is not added into the bio, thus would manually release the page. I do not think anyone should call bio_add_folio()/bio_add_page() with zero length, but idiots like me can still show up. So add an extra WARN_ON_ONCE() check for zero length and rejects it early to avoid double freeing. Signed-off-by: Qu Wenruo <[email protected]> Link: https://patch.msgid.link/bc2223c080f38d0b63f968f605c918181c840f40.1773734749.git.wqu@suse.com Signed-off-by: Jens Axboe <[email protected]>
1 parent 3141e0e commit 6438936

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

block/bio.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,8 @@ int bio_add_page(struct bio *bio, struct page *page,
10261026
{
10271027
if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)))
10281028
return 0;
1029+
if (WARN_ON_ONCE(len == 0))
1030+
return 0;
10291031
if (bio->bi_iter.bi_size > BIO_MAX_SIZE - len)
10301032
return 0;
10311033

0 commit comments

Comments
 (0)