This is a note to let you know that I've just added the patch titled
blk-mq: fix double-free in error path
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
blk-mq-fix-double-free-in-error-path.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 564e559f2baf6a868768d0cac286980b3cfd6e30 Mon Sep 17 00:00:00 2001
From: Tony Battersby <[email protected]>
Date: Wed, 11 Feb 2015 11:32:30 -0500
Subject: blk-mq: fix double-free in error path
From: Tony Battersby <[email protected]>
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 <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
block/blk-mq-tag.c | 1 +
1 file changed, 1 insertion(+)
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -500,6 +500,7 @@ static int bt_alloc(struct blk_mq_bitmap
bt->bs = kzalloc(BT_WAIT_QUEUES * sizeof(*bt->bs), GFP_KERNEL);
if (!bt->bs) {
kfree(bt->map);
+ bt->map = NULL;
return -ENOMEM;
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/blk-mq-fix-double-free-in-error-path.patch
queue-3.18/sg-fix-ewouldblock-errors-with-scsi-mq.patch
queue-3.18/sg-fix-unkillable-i-o-wait-deadlock-with-scsi-mq.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
