From 567528cad1dfddeb28c70890008b4187be62f3cc Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 13 Mar 2010 14:14:22 +0300
Subject: [PATCH] --- yaml --- r: 188065 b: refs/heads/master c:
 181427a7e01beab76c789414334375839f026128 h: refs/heads/master i:   188063:
 8b927b263bccd08ef34a577c67d81fc390d5de5e v: v3

---
 [refs]                         | 2 +-
 trunk/security/tomoyo/common.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 443a2fd16cfc..53eb20ef4e0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bca14dd14f3b0c5e3e2d1d314679f85b67871365
+refs/heads/master: 181427a7e01beab76c789414334375839f026128
diff --git a/trunk/security/tomoyo/common.c b/trunk/security/tomoyo/common.c
index ff51f1026b57..ef89947a774b 100644
--- a/trunk/security/tomoyo/common.c
+++ b/trunk/security/tomoyo/common.c
@@ -886,6 +886,7 @@ static struct tomoyo_profile *tomoyo_find_or_assign_new_profile(const unsigned
 	ptr = kmalloc(sizeof(*ptr), GFP_KERNEL);
 	if (!tomoyo_memory_ok(ptr)) {
 		kfree(ptr);
+		ptr = NULL;
 		goto ok;
 	}
 	for (i = 0; i < TOMOYO_MAX_CONTROL_INDEX; i++)