diff options
| author | Hou Tao <houtao1@huawei.com> | 2017-02-03 12:19:07 +0300 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-21 06:49:54 +0300 |
| commit | 2191fc0f29b2d4e8e3e4aa5bf75df771aa7b1f88 (patch) | |
| tree | 419c1408e5aeef7840738fbde34eba7baec295c3 /block | |
| parent | dfa3da735104f8e7f2e13c4be1c6650dcf3f1046 (diff) | |
| download | linux-2191fc0f29b2d4e8e3e4aa5bf75df771aa7b1f88.tar.xz | |
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>
Diffstat (limited to 'block')
| -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 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; |