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:37:53 +0200 |
| commit | 6ec54fc43b5a43c6b456b04843f13a2dded1c4f2 (patch) | |
| tree | d5104dd11be2d101e8307d906ee6c15b2bae3a2f /block | |
| parent | 2fc37a0abf1ff4fdf35d1a90fb80ec98c588184a (diff) | |
| download | linux-stable-6ec54fc43b5a43c6b456b04843f13a2dded1c4f2.tar.gz linux-stable-6ec54fc43b5a43c6b456b04843f13a2dded1c4f2.tar.bz2 linux-stable-6ec54fc43b5a43c6b456b04843f13a2dded1c4f2.zip | |
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 2e5d881423b8..d01ab919b313 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1280,8 +1280,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; |