From: Li Zefan <lizefan@huawei.com>
Date: Tue, 18 Jun 2013 10:41:53 +0000 (+0800)
Subject: cgroup: fix memory leak in cgroup_rm_cftypes()
X-Git-Tag: android-x86-4.4-r2~3051^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f57947d27711451a7739a25bba6cddc8a385e438;p=android-x86%2Fkernel.git

cgroup: fix memory leak in cgroup_rm_cftypes()

The memory allocated in cgroup_add_cftypes() should be freed. The
effect of this bug is we leak a bit memory everytime we unload
cfq-iosched module if blkio cgroup is enabled.

Signed-off-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
---

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7db2940bfc77..1d4f471de8d5 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2889,7 +2889,8 @@ int cgroup_rm_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
 
 	list_for_each_entry(set, &ss->cftsets, node) {
 		if (set->cfts == cfts) {
-			list_del_init(&set->node);
+			list_del(&set->node);
+			kfree(set);
 			cgroup_cfts_commit(ss, cfts, false);
 			return 0;
 		}