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-27 09:30:26 +0200 |
| commit | fa3ce990acc9414b5f64f758292267ccb64c5a68 (patch) | |
| tree | 7af1ffa22d738c94794a7dbb68352c04dcf09a54 | |
| parent | 6040571bec16b2410f5576b4907c9c1706c6c2fa (diff) | |
| download | linux-stable-fa3ce990acc9414b5f64f758292267ccb64c5a68.tar.gz linux-stable-fa3ce990acc9414b5f64f758292267ccb64c5a68.tar.bz2 linux-stable-fa3ce990acc9414b5f64f758292267ccb64c5a68.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>
| -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 140c45b2b717..0a41e94eda2f 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1217,8 +1217,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; |