diff --git a/[refs] b/[refs] index b007f4a10302..dce948a23bd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffd2d883399cbbb641e55730676ce1ec4845d99d +refs/heads/master: f777073848ba3708d68d87e43f104f83316187d7 diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index 36066d8a4911..947fe3b22182 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -954,8 +954,11 @@ static int cgroup_get_sb(struct file_system_type *fs_type, } root = kzalloc(sizeof(*root), GFP_KERNEL); - if (!root) + if (!root) { + if (opts.release_agent) + kfree(opts.release_agent); return -ENOMEM; + } init_cgroup_root(root); root->subsys_bits = opts.subsys_bits;