Skip to content

Commit

Permalink
block: do not leak memory in bio_copy_user_iov()
Browse files Browse the repository at this point in the history
commit a3761c3 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>
  • Loading branch information
Jérôme Glisse authored and gregkh committed Apr 17, 2019
1 parent 7af20b6 commit 2591bfc
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion block/bio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1240,8 +1240,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;
Expand Down

0 comments on commit 2591bfc

Please sign in to comment.