diff options
| author | Hou Tao <houtao1@huawei.com> | 2017-02-03 17:19:07 +0800 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2018-05-31 16:37:07 -0700 |
| commit | 44b7e8ce58f900529d877b275ee5f94b0e7aae3b (patch) | |
| tree | 3f791c5e1f763549aa3e2a9678d8feae5e9f4714 | |
| parent | cbf32807d3963df3ba5420a6a92f692838aca1d0 (diff) | |
blkcg: fix double free of new_blkg in blkcg_init_queueASB-2018-06-05_4.9-o-mr1
commit 9b54d816e00425c3a517514e0d677bb3cec49258 upstream.
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>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | block/blk-cgroup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index b08ccbb9393a..6cd839c1f507 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1078,10 +1078,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; |