Skip to content

Commit d9cf3bd

Browse files
isilenceaxboe
authored andcommitted
bio: fix page leak bio_add_hw_page failure
__bio_iov_append_get_pages() doesn't put not appended pages on bio_add_hw_page() failure, so potentially leaking them, fix it. Also, do the same for __bio_iov_iter_get_pages(), even though it looks like it can't be triggered by userspace in this case. Fixes: 0512a75 ("block: Introduce REQ_OP_ZONE_APPEND") Cc: [email protected] # 5.8+ Signed-off-by: Pavel Begunkov <[email protected]> Link: https://lore.kernel.org/r/1edfa6a2ffd66d55e6345a477df5387d2c1415d0.1626653825.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <[email protected]>
1 parent c4b2b7d commit d9cf3bd

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

block/bio.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,14 @@ static int bio_iov_bvec_set_append(struct bio *bio, struct iov_iter *iter)
974974
return 0;
975975
}
976976

977+
static void bio_put_pages(struct page **pages, size_t size, size_t off)
978+
{
979+
size_t i, nr = DIV_ROUND_UP(size + (off & ~PAGE_MASK), PAGE_SIZE);
980+
981+
for (i = 0; i < nr; i++)
982+
put_page(pages[i]);
983+
}
984+
977985
#define PAGE_PTRS_PER_BVEC (sizeof(struct bio_vec) / sizeof(struct page *))
978986

979987
/**
@@ -1018,8 +1026,10 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
10181026
if (same_page)
10191027
put_page(page);
10201028
} else {
1021-
if (WARN_ON_ONCE(bio_full(bio, len)))
1022-
return -EINVAL;
1029+
if (WARN_ON_ONCE(bio_full(bio, len))) {
1030+
bio_put_pages(pages + i, left, offset);
1031+
return -EINVAL;
1032+
}
10231033
__bio_add_page(bio, page, len, offset);
10241034
}
10251035
offset = 0;
@@ -1064,6 +1074,7 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter)
10641074
len = min_t(size_t, PAGE_SIZE - offset, left);
10651075
if (bio_add_hw_page(q, bio, page, len, offset,
10661076
max_append_sectors, &same_page) != len) {
1077+
bio_put_pages(pages + i, left, offset);
10671078
ret = -EINVAL;
10681079
break;
10691080
}

0 commit comments

Comments
 (0)