[PATCH 3.4 and earlier] Re: FAILED: patch "[PATCH] blk-core: Fix memory corruption if blkcg_init_queue fails" failed to apply to 3.4-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi

Here I'm resending the upstream patch 
fff4996b7db7955414ac74386efa5e07fd766b50, modified for 3.4 (and earlier) 
stable kernels.

Signed-off-by: Mikulas Patocka <mpatocka@xxxxxxxxxx>

---
 block/blk-core.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-3.4.71/block/blk-core.c
===================================================================
--- linux-3.4.71.orig/block/blk-core.c	2013-12-06 17:05:54.000000000 +0100
+++ linux-3.4.71/block/blk-core.c	2013-12-06 17:06:50.000000000 +0100
@@ -499,7 +499,7 @@ struct request_queue *blk_alloc_queue_no
 		goto fail_id;
 
 	if (blk_throtl_init(q))
-		goto fail_id;
+		goto fail_bdi;
 
 	setup_timer(&q->backing_dev_info.laptop_mode_wb_timer,
 		    laptop_mode_timer_fn, (unsigned long) q);
@@ -524,6 +524,8 @@ struct request_queue *blk_alloc_queue_no
 
 	return q;
 
+fail_bdi:
+	bdi_destroy(&q->backing_dev_info);
 fail_id:
 	ida_simple_remove(&blk_queue_ida, q->id);
 fail_q:

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]