Commit 564e559f authored Feb 11, 2015 by Tony Battersby Committed by Jens Axboe Feb 11, 2015

blk-mq: fix double-free in error path



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.

Cc: <stable@vger.kernel.org>
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 854fbb9c

block/blk-mq-tag.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -524,6 +524,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;
		}