diff options
| author | Sha Zhengju <handai.szj@taobao.com> | 2012-05-10 22:01:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-11 00:06:44 +0200 |
| commit | 8c7577637ca31385e92769a77e2ab5b428e8b99c (patch) | |
| tree | ecf350b4defdd9ad31a9d1eb6353b890c5951eb9 /mm | |
| parent | namespaces, pid_ns: fix leakage on fork() failure (diff) | |
| download | linux-8c7577637ca31385e92769a77e2ab5b428e8b99c.tar.xz linux-8c7577637ca31385e92769a77e2ab5b428e8b99c.zip | |
memcg: free spare array to avoid memory leak
When the last event is unregistered, there is no need to keep the spare
array anymore. So free it to avoid memory leak.
Signed-off-by: Sha Zhengju <handai.szj@taobao.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memcontrol.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 31ab9c3f0178..b659260c56ad 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4507,6 +4507,12 @@ static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp, swap_buffers: /* Swap primary and spare array */ thresholds->spare = thresholds->primary; + /* If all events are unregistered, free the spare array */ + if (!new) { + kfree(thresholds->spare); + thresholds->spare = NULL; + } + rcu_assign_pointer(thresholds->primary, new); /* To be sure that nobody uses thresholds */ |