]> Pileus Git - ~andy/linux/commitdiff
cgroup: fix memory leak in cgroup_rm_cftypes()
authorLi Zefan <lizefan@huawei.com>
Tue, 18 Jun 2013 10:41:53 +0000 (18:41 +0800)
committerTejun Heo <tj@kernel.org>
Tue, 18 Jun 2013 16:04:30 +0000 (09:04 -0700)
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>
kernel/cgroup.c

index 7db2940bfc77b79c1ba78f150f18db294719ebe2..1d4f471de8d54e508ff2fb9ca99d2be5924b5c03 100644 (file)
@@ -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;
                }