mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

blkcg: fix blkcg->css ref leak in __blkg_lookup_create()

Browse source 
__blkg_lookup_create() leaked blkcg->css ref if blkg allocation
failed.  Fix it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Tejun Heo 2012-04-19 16:29:23 -07:00 committed by Jens Axboe
parent aaf7c68068
commit 496fb7806d
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
block/blk-cgroup.c
View file

@ -174,6 +174,7 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
__releases(q->queue_lock) __acquires(q->queue_lock) __releases(q->queue_lock) __acquires(q->queue_lock)
{ {
struct blkcg_gq *blkg; struct blkcg_gq *blkg;
int ret;
WARN_ON_ONCE(!rcu_read_lock_held()); WARN_ON_ONCE(!rcu_read_lock_held());
lockdep_assert_held(q->queue_lock); lockdep_assert_held(q->queue_lock);
@ -186,24 +187,22 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
if (!css_tryget(&blkcg->css)) if (!css_tryget(&blkcg->css))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
/* /* allocate */
* Allocate and initialize. ret = -ENOMEM;
*/
blkg = blkg_alloc(blkcg, q); blkg = blkg_alloc(blkcg, q);
if (unlikely(!blkg))
/* did alloc fail? */ goto err_put;
if (unlikely(!blkg)) {
blkg = ERR_PTR(-ENOMEM);
goto out;
}
/* insert */ /* insert */
spin_lock(&blkcg->lock); spin_lock(&blkcg->lock);
hlist_add_head_rcu(&blkg->blkcg_node, &blkcg->blkg_list); hlist_add_head_rcu(&blkg->blkcg_node, &blkcg->blkg_list);
list_add(&blkg->q_node, &q->blkg_list); list_add(&blkg->q_node, &q->blkg_list);
spin_unlock(&blkcg->lock); spin_unlock(&blkcg->lock);
out:
return blkg; return blkg;
err_put:
css_put(&blkcg->css);
return ERR_PTR(ret);
} }
struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg, struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg,