Skip to content

Commit

Permalink
workqueue: fix memory leak in apply_workqueue_attrs()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tejun Heo committed Apr 1, 2013
1 parent 13e2e55 commit 4862125
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions kernel/workqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -3636,6 +3636,7 @@ int apply_workqueue_attrs(struct workqueue_struct *wq,
struct workqueue_attrs *new_attrs;
struct pool_workqueue *pwq = NULL, *last_pwq;
struct worker_pool *pool;
int ret;

/* only unbound workqueues can change attributes */
if (WARN_ON(!(wq->flags & WQ_UNBOUND)))
Expand Down Expand Up @@ -3668,12 +3669,16 @@ int apply_workqueue_attrs(struct workqueue_struct *wq,
spin_unlock_irq(&last_pwq->pool->lock);
}

return 0;
ret = 0;
/* fall through */
out_free:
free_workqueue_attrs(new_attrs);
return ret;

enomem:
kmem_cache_free(pwq_cache, pwq);
free_workqueue_attrs(new_attrs);
return -ENOMEM;
ret = -ENOMEM;
goto out_free;
}

static int alloc_and_link_pwqs(struct workqueue_struct *wq)
Expand Down

0 comments on commit 4862125

Please sign in to comment.