From: Hou Tao <houtao1@huawei.com>
Date: Fri, 3 Feb 2017 09:19:07 +0000 (+0800)
Subject: blkcg: fix double free of new_blkg in blkcg_init_queue
X-Git-Tag: v4.1.51~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2191fc0f29b2d4e8e3e4aa5bf75df771aa7b1f88;p=platform%2Fkernel%2Flinux-exynos.git

blkcg: fix double free of new_blkg in blkcg_init_queue

[ Upstream commit 9b54d816e00425c3a517514e0d677bb3cec49258 ]

If blkg_create fails, new_blkg passed as an argument will
be freed by blkg_create, so there is no need to free it again.

Signed-off-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 7104d9e1b5f9..4d1cc6982518 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -870,10 +870,8 @@ int blkcg_init_queue(struct request_queue *q)
 	if (preloaded)
 		radix_tree_preload_end();
 
-	if (IS_ERR(blkg)) {
-		blkg_free(new_blkg);
+	if (IS_ERR(blkg))
 		return PTR_ERR(blkg);
-	}
 
 	q->root_blkg = blkg;
 	q->root_rl.blkg = blkg;