diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-09-23 15:51:23 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-10-10 23:54:57 -0400 |
| commit | 2b04e8f6bbb196cab4b232af0f8d48ff2c7a8058 (patch) | |
| tree | 8be4924951564fb02964129570dd5c64c5e63584 /block/bio.c | |
| parent | 95d78c28b5a85bacbc29b8dba7c04babb9b0d467 (diff) | |
| download | linux-0-day-2b04e8f6bbb196cab4b232af0f8d48ff2c7a8058.tar.gz linux-0-day-2b04e8f6bbb196cab4b232af0f8d48ff2c7a8058.tar.xz | |
more bio_map_user_iov() leak fixes
we need to take care of failure exit as well - pages already
in bio should be dropped by analogue of bio_unmap_pages(),
since their refcounts had been bumped only once per reference
in bio.
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block/bio.c')
| -rw-r--r-- | block/bio.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/block/bio.c b/block/bio.c index 0d6439e89acb7..9e9606d26cc6a 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1331,6 +1331,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, int ret, offset; struct iov_iter i; struct iovec iov; + struct bio_vec *bvec; iov_for_each(iov, i, *iter) { unsigned long uaddr = (unsigned long) iov.iov_base; @@ -1375,7 +1376,12 @@ struct bio *bio_map_user_iov(struct request_queue *q, ret = get_user_pages_fast(uaddr, local_nr_pages, (iter->type & WRITE) != WRITE, &pages[cur_page]); - if (ret < local_nr_pages) { + if (unlikely(ret < local_nr_pages)) { + for (j = cur_page; j < page_limit; j++) { + if (!pages[j]) + break; + put_page(pages[j]); + } ret = -EFAULT; goto out_unmap; } @@ -1431,10 +1437,8 @@ struct bio *bio_map_user_iov(struct request_queue *q, return bio; out_unmap: - for (j = 0; j < nr_pages; j++) { - if (!pages[j]) - break; - put_page(pages[j]); + bio_for_each_segment_all(bvec, bio, j) { + put_page(bvec->bv_page); } out: kfree(pages); |