Commit 633a5a52 authored Feb 03, 2017 by Hou Tao Committed by Greg Kroah-Hartman Mar 22, 2018

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>

parent b8ea1f9b

block/blk-cgroup.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;