diff options
| author | Xiaochen Wang <wangxiaochen0@gmail.com> | 2011-03-30 17:27:32 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-31 01:25:06 +0200 |
| commit | cfc64fd91fabed099a4c3df58559f4b7efe9bcce (patch) | |
| tree | 6ecc7efb4d61ba9e1ae21a11e50f175961f76cf8 | |
| parent | Merge branch 'next-queue' into next (diff) | |
| download | linux-cfc64fd91fabed099a4c3df58559f4b7efe9bcce.tar.xz linux-cfc64fd91fabed099a4c3df58559f4b7efe9bcce.zip | |
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>
| -rw-r--r-- | security/tomoyo/memory.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |