From cf6ce801aac5dc832d0f559173d23263e59ab2c6 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Sat, 23 Feb 2008 15:24:10 -0800
Subject: [PATCH] --- yaml --- r: 86245 b: refs/heads/master c:
 f777073848ba3708d68d87e43f104f83316187d7 h: refs/heads/master i:   86243:
 d7ec089a119607f7ef0b23f0e703e41201daeb48 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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;