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++)