diff options
| author | Hou Tao <houtao1@huawei.com> | 2017-02-03 17:19:07 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-22 09:17:35 +0100 |
| commit | 7bd2d0c746f1fac2fb7f2ee972767cbc8be60962 (patch) | |
| tree | d5f36ac8dd756cc37f5b4a56a1606d7eaded6876 /block | |
| parent | 46e076f0dad02f5c445a5c27adbd3f06147e33ed (diff) | |
| download | linux-stable-7bd2d0c746f1fac2fb7f2ee972767cbc8be60962.tar.gz linux-stable-7bd2d0c746f1fac2fb7f2ee972767cbc8be60962.tar.bz2 linux-stable-7bd2d0c746f1fac2fb7f2ee972767cbc8be60962.zip | |
blkcg: fix double free of new_blkg in blkcg_init_queue
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>
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 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; |