aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorGravatar Li Zefan <lizefan@huawei.com> 2014-02-14 16:55:04 +0800
committerGravatar Tejun Heo <tj@kernel.org> 2014-02-14 10:52:40 -0500
commit6534fd6c15858fe4ce4ae568106225e68d5afa81 (patch)
tree895805085f542dfa62ce380d0d91d98d5fdb2283 /kernel
parentcgroup: fix locking in cgroupstats_build() (diff)
downloadlinux-6534fd6c15858fe4ce4ae568106225e68d5afa81.tar.gz
linux-6534fd6c15858fe4ce4ae568106225e68d5afa81.tar.bz2
linux-6534fd6c15858fe4ce4ae568106225e68d5afa81.zip
cgroup: fix memory leak in cgroup_mount()
We should free the memory allocated in parse_cgroupfs_options() before calling this function again. Signed-off-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 5606c0f08d95..3fe01102607b 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1540,6 +1540,8 @@ retry:
if (!atomic_inc_not_zero(&root->top_cgroup.refcnt)) {
mutex_unlock(&cgroup_mutex);
mutex_unlock(&cgroup_tree_mutex);
+ kfree(opts.release_agent);
+ kfree(opts.name);
msleep(10);
goto retry;
}