aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Glisse <jglisse@redhat.com>2019-04-10 16:27:51 -0400
committerJens Axboe <axboe@kernel.dk>2019-04-10 18:14:40 -0400
commita3761c3c91209b58b6f33bf69dd8bb8ec0c9d925 (patch)
treea4308f3aae5a90ea3927becb776ff41acffe0163
parentb2b3a70cd9984fe39ed5aaa9ce596476051ce5de (diff)
block: do not leak memory in bio_copy_user_iov()
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>
-rw-r--r--block/bio.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/block/bio.c b/block/bio.c
index b64cedc7f87c..716510ecd7ff 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1298,8 +1298,11 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
1298 } 1298 }
1299 } 1299 }
1300 1300
1301 if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) 1301 if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) {
1302 if (!map_data)
1303 __free_page(page);
1302 break; 1304 break;
1305 }
1303 1306
1304 len -= bytes; 1307 len -= bytes;
1305 offset = 0; 1308 offset = 0;