tomoyo: Fix null pointer check

Since tomoyo_memory_ok() will check for null pointer returned by
kzalloc() in tomoyo_assign_profile(), tomoyo_assign_namespace(),
tomoyo_get_name() and tomoyo_commit_ok(), then emit OOM warnings
if needed. And this is the expected behavior as informed by
Tetsuo Handa.

Let's add __GFP_NOWARN to kzalloc() in those related functions.
Besides, to achieve this goal, remove the null check for entry
right after kzalloc() in tomoyo_assign_namespace().

Reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 4bee32bfe16d1ca88de117e3aedb5cd28f93b58f..bc54d3c8c70ae07c543e77814d79d0bd221be51a 100644 (file)
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -498,7 +498,7 @@ static struct tomoyo_profile *tomoyo_assign_profile
        ptr = ns->profile_ptr[profile];
        if (ptr)
                return ptr;
-       entry = kzalloc(sizeof(*entry), GFP_NOFS);
+       entry = kzalloc(sizeof(*entry), GFP_NOFS | __GFP_NOWARN);
        if (mutex_lock_interruptible(&tomoyo_policy_lock))
                goto out;
        ptr = ns->profile_ptr[profile];

diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index dc4ecc0b20386713e512a0f0d5db9de99701939f..c6e5cc5cc7cd5f21a440dcf881da10ac44eb9baa 100644 (file)
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -473,9 +473,7 @@ struct tomoyo_policy_namespace *tomoyo_assign_namespace(const char *domainname)
                return ptr;
        if (len >= TOMOYO_EXEC_TMPSIZE - 10 || !tomoyo_domain_def(domainname))
                return NULL;
-       entry = kzalloc(sizeof(*entry) + len + 1, GFP_NOFS);
-       if (!entry)
-               return NULL;
+       entry = kzalloc(sizeof(*entry) + len + 1, GFP_NOFS | __GFP_NOWARN);
        if (mutex_lock_interruptible(&tomoyo_policy_lock))
                goto out;
        ptr = tomoyo_find_namespace(domainname, len);

diff --git a/security/tomoyo/memory.c b/security/tomoyo/memory.c
index 2e7fcfa923c9199a2ee83ae0bd776e9aecb6ec93..1b570bde7a3b2f56a672772cbb710d3b2ad16041 100644 (file)
--- a/security/tomoyo/memory.c
+++ b/security/tomoyo/memory.c
@@ -73,7 +73,7 @@ bool tomoyo_memory_ok(void *ptr)
  */
 void *tomoyo_commit_ok(void *data, const unsigned int size)
 {
-       void *ptr = kzalloc(size, GFP_NOFS);
+       void *ptr = kzalloc(size, GFP_NOFS | __GFP_NOWARN);
 
        if (tomoyo_memory_ok(ptr)) {
                memmove(ptr, data, size);
@@ -170,7 +170,7 @@ const struct tomoyo_path_info *tomoyo_get_name(const char *name)
                atomic_inc(&ptr->head.users);
                goto out;
        }
-       ptr = kzalloc(sizeof(*ptr) + len, GFP_NOFS);
+       ptr = kzalloc(sizeof(*ptr) + len, GFP_NOFS | __GFP_NOWARN);
        if (tomoyo_memory_ok(ptr)) {
                ptr->entry.name = ((char *) ptr) + sizeof(*ptr);
                memmove((char *) ptr->entry.name, name, len);