summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMing Lei <ming.lei@redhat.com>2019-04-24 19:01:46 +0800
committerJens Axboe <axboe@kernel.dk>2019-04-24 08:06:04 -0600
commit0257c0ed5ea3de3e32cb322852c4c40bc09d1b97 (patch)
treeaa72c195716985cd0c83e50308a5212c1c57307a /block
parent551879a48f01826fd86568d7bd1e774cb0de3295 (diff)
downloadlinux-stable-0257c0ed5ea3de3e32cb322852c4c40bc09d1b97.tar.gz
linux-stable-0257c0ed5ea3de3e32cb322852c4c40bc09d1b97.tar.bz2
linux-stable-0257c0ed5ea3de3e32cb322852c4c40bc09d1b97.zip
block: don't run get_page() on pages from non-bvec iov iter
The refcount has been increased for pages retrieved from non-bvec iov iter via __bio_iov_iter_get_pages(), so don't need to do that again. Otherwise, IO pages are leaked easily. Cc: Christoph Hellwig <hch@lst.de> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Fixes: 7321ecbfc7cf ("block: change how we get page references in bio_iov_iter_get_pages") Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/bio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bio.c b/block/bio.c
index c81ed2dfee53..662d45752ec5 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -992,7 +992,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
if (iov_iter_bvec_no_ref(iter))
bio_set_flag(bio, BIO_NO_PAGE_REF);
- else
+ else if (is_bvec)
bio_get_pages(bio);
return bio->bi_vcnt ? 0 : ret;