diff options
| author | Vitaly Mayatskikh <v.mayatskih@gmail.com> | 2017-09-22 08:18:39 +0300 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-11-06 07:54:26 +0300 |
| commit | 97c0249ef452b3ac850b812948dd992b37cdbd46 (patch) | |
| tree | 7875cbdb357a74de7ab6c42a6922e17cdd385893 /block | |
| parent | ed4edd00925058f347e151be0029dc7a1c7938b5 (diff) | |
| download | linux-97c0249ef452b3ac850b812948dd992b37cdbd46.tar.xz | |
fix unbalanced page refcounting in bio_map_user_iov
[ Upstream commit 95d78c28b5a85bacbc29b8dba7c04babb9b0d467 ]
bio_map_user_iov and bio_unmap_user do unbalanced pages refcounting if
IO vector has small consecutive buffers belonging to the same page.
bio_add_pc_page merges them into one, but the page reference is never
dropped.
Cc: stable@vger.kernel.org
Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/block/bio.c b/block/bio.c index cbce3e2208f4..d9cf77c6a847 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1342,6 +1342,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, offset = uaddr & ~PAGE_MASK; for (j = cur_page; j < page_limit; j++) { unsigned int bytes = PAGE_SIZE - offset; + unsigned short prev_bi_vcnt = bio->bi_vcnt; if (len <= 0) break; @@ -1356,6 +1357,13 @@ struct bio *bio_map_user_iov(struct request_queue *q, bytes) break; + /* + * check if vector was merged with previous + * drop page reference if needed + */ + if (bio->bi_vcnt == prev_bi_vcnt) + put_page(pages[j]); + len -= bytes; offset = 0; } |