From: Xiaochen Wang <wangxiaochen0@gmail.com>
Date: Wed, 30 Mar 2011 15:27:32 +0000 (+0900)
Subject: tomoyo: fix memory leak in tomoyo_commit_ok()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cfc64fd91fabed099a4c3df58559f4b7efe9bcce;p=deliverable%2Flinux.git

tomoyo: fix memory leak in tomoyo_commit_ok()

When memory used for policy exceeds the quota, tomoyo_memory_ok() return false.
In this case, tomoyo_commit_ok() must call kfree() before returning NULL.
This bug exists since 2.6.35.

Signed-off-by: Xiaochen Wang <wangxiaochen0@gmail.com>
Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/tomoyo/memory.c b/security/tomoyo/memory.c
index 297612669c74..42a7b1ba8cbf 100644
--- a/security/tomoyo/memory.c
+++ b/security/tomoyo/memory.c
@@ -75,6 +75,7 @@ void *tomoyo_commit_ok(void *data, const unsigned int size)
 		memset(data, 0, size);
 		return ptr;
 	}
+	kfree(ptr);
 	return NULL;
 }