lkml.org 
[lkml]   [2013]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 0.5/14] workqueue: fix memory leak in apply_workqueue_attrs()
From 4862125b0256a946d2749a1d5003b0604bc3cb4d Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 1 Apr 2013 11:23:31 -0700

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 causes some minor conflicts down the series but nothing
noteworthy. I'm not posting the whole refreshed series. If you want
it, holler.

Thanks.

kernel/workqueue.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index abe1f0d..89480fc 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -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)))
@@ -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)
--
1.8.1.4


\
 
 \ /
  Last update: 2013-04-01 21:21    [W:0.128 / U:0.328 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site