Merge branch 'master' into next

[safe/jmp/linux-2.6] / security / tomoyo / common.c

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 8ccf129..588f36a 100644 (file)
--- a/security/tomoyo/common.c
+++ b/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++)