lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

workqueue: fix memory leak in apply_workqueue_attrs()

Browse Source 
apply_workqueue_attrs() wasn't freeing temp attrs variable @new_attrs
in its success path.  Fix it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Lai Jiangshan <laijs@cn.fujitsu.com>
This commit is contained in:
Tejun Heo
2013-04-01 11:23:31 -07:00
parent 13e2e55601
commit 4862125b02
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/workqueue.c
View File

@@ -3636,6 +3636,7 @@ int apply_workqueue_attrs(struct workqueue_struct *wq,
struct workqueue_attrs *new_attrs; struct workqueue_attrs *new_attrs;
struct pool_workqueue *pwq = NULL, *last_pwq; struct pool_workqueue *pwq = NULL, *last_pwq;
struct worker_pool *pool; struct worker_pool *pool;
int ret;
/* only unbound workqueues can change attributes */ /* only unbound workqueues can change attributes */
if (WARN_ON(!(wq->flags & WQ_UNBOUND))) if (WARN_ON(!(wq->flags & WQ_UNBOUND)))
@@ -3668,12 +3669,16 @@ int apply_workqueue_attrs(struct workqueue_struct *wq,
spin_unlock_irq(&last_pwq->pool->lock); spin_unlock_irq(&last_pwq->pool->lock);
} }
return 0; ret = 0;
/* fall through */
out_free:
free_workqueue_attrs(new_attrs);
return ret;
enomem: enomem:
kmem_cache_free(pwq_cache, pwq); kmem_cache_free(pwq_cache, pwq);
free_workqueue_attrs(new_attrs); ret = -ENOMEM;
return -ENOMEM; goto out_free;
} }
static int alloc_and_link_pwqs(struct workqueue_struct *wq) static int alloc_and_link_pwqs(struct workqueue_struct *wq)