diff options
author | Jérôme Glisse <jglisse@redhat.com> | 2019-04-10 16:27:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-17 08:39:50 +0200 |
commit | b4af1b3cb545961740e6e4ee6df17117a9262cef (patch) | |
tree | 20c0078f47719bfa5131d0736be3ce234feb5e58 /block | |
parent | 43d15c041ad7422880dfd29d6d5dc0a86c58c1ae (diff) |
block: do not leak memory in bio_copy_user_iov()
commit a3761c3c91209b58b6f33bf69dd8bb8ec0c9d925 upstream.
When bio_add_pc_page() fails in bio_copy_user_iov() we should free
the page we just allocated otherwise we are leaking it.
Cc: linux-block@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: stable@vger.kernel.org
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r-- | block/bio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/bio.c b/block/bio.c index 4db1008309ed..a06f58bd4c72 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1238,8 +1238,11 @@ struct bio *bio_copy_user_iov(struct request_queue *q, } } - if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) + if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) { + if (!map_data) + __free_page(page); break; + } len -= bytes; offset = 0; |