From: Tony Battersby <tonyb@cybernetics.com>
Date: Wed, 11 Feb 2015 16:32:30 +0000 (-0500)
Subject: blk-mq: fix double-free in error path
X-Git-Tag: v3.16.35~2736
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5caff734425cddbb1efe801e88ce2a39fdb052b;p=thirdparty%2Fkernel%2Fstable.git

blk-mq: fix double-free in error path

commit 564e559f2baf6a868768d0cac286980b3cfd6e30 upstream.

If the allocation of bt->bs fails, then bt->map can be freed twice, once
in blk_mq_init_bitmap_tags() -> bt_alloc(), and once in
blk_mq_init_bitmap_tags() -> bt_free().  Fix by setting the pointer to
NULL after the first free.

Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 1caaa7c4605df..b88f4b375c27e 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -511,6 +511,7 @@ static int bt_alloc(struct blk_mq_bitmap_tags *bt, unsigned int depth,
 	bt->bs = kzalloc(BT_WAIT_QUEUES * sizeof(*bt->bs), GFP_KERNEL);
 	if (!bt->bs) {
 		kfree(bt->map);
+		bt->map = NULL;
 		return -ENOMEM;
 	}