Commit 2591bfc6 authored Apr 10, 2019 by Jérôme Glisse Committed by Greg Kroah-Hartman Apr 17, 2019

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>

parent 7af20b60

block/bio.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;