diff options
| author | weiping zhang <zhangweiping@didichuxing.com> | 2017-08-25 23:49:32 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-08-25 13:51:07 -0600 |
| commit | 4c18c9e962eb02e23731e5b40d4474fb04fdcb23 (patch) | |
| tree | 2428fbbf84cf04811edcbf3baebc127711b45d20 /block | |
| parent | 231b3db18d4be74e8b199916911c2c16db1790de (diff) | |
| download | op-kernel-dev-4c18c9e962eb02e23731e5b40d4474fb04fdcb23.zip op-kernel-dev-4c18c9e962eb02e23731e5b40d4474fb04fdcb23.tar.gz | |
blkcg: avoid free blkcg_root when failed to alloc blkcg policy
this patch fix two errors, firstly avoid kfree blk_root, secondly not
free(blkcg) ,if blkcg alloc fail(blkcg == NULL), just unlock that mutex;
Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 0480892..d3f56ba 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1067,7 +1067,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL); if (!blkcg) { ret = ERR_PTR(-ENOMEM); - goto free_blkcg; + goto unlock; } } @@ -1111,8 +1111,10 @@ free_pd_blkcg: for (i--; i >= 0; i--) if (blkcg->cpd[i]) blkcg_policy[i]->cpd_free_fn(blkcg->cpd[i]); -free_blkcg: - kfree(blkcg); + + if (blkcg != &blkcg_root) + kfree(blkcg); +unlock: mutex_unlock(&blkcg_pol_mutex); return ret; } |
