summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorHou Tao <houtao1@huawei.com>2017-02-03 17:19:07 +0800
committerJens Axboe <axboe@fb.com>2017-02-03 07:52:35 -0700
commit9b54d816e00425c3a517514e0d677bb3cec49258 (patch)
tree4316604c3430ab596be3b6e6a120de23a384a541 /block
parent0cacba6cf8252438f8166bd3fa1c3370dd28a769 (diff)
downloadblackbird-op-linux-9b54d816e00425c3a517514e0d677bb3cec49258.tar.gz
blackbird-op-linux-9b54d816e00425c3a517514e0d677bb3cec49258.zip
blkcg: fix double free of new_blkg in blkcg_init_queue
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>
Diffstat (limited to 'block')
-rw-r--r--block/blk-cgroup.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 37fe595cfd70..295e98c2c8cc 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1079,10 +1079,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;
OpenPOWER on IntegriCloud