1 files changed, 15 insertions, 10 deletions

diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index acb8c397d5cf..a1723bbcde0e 100644
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -153,8 +153,9 @@ static int tomoyo_update_domain_initializer_entry(const char *domainname,
         if (!saved_program)
                 goto out;
         if (!is_delete)
-                entry = kmalloc(sizeof(*entry), GFP_KERNEL);
-        mutex_lock(&tomoyo_policy_lock);
+                entry = kmalloc(sizeof(*entry), GFP_NOFS);
+        if (mutex_lock_interruptible(&tomoyo_policy_lock))
+                goto out;
         list_for_each_entry_rcu(ptr, &tomoyo_domain_initializer_list, list) {
                 if (ptr->is_not != is_not ||
                     ptr->domainname != saved_domainname ||
@@ -373,8 +374,9 @@ static int tomoyo_update_domain_keeper_entry(const char *domainname,
         if (!saved_domainname)
                 goto out;
         if (!is_delete)
-                entry = kmalloc(sizeof(*entry), GFP_KERNEL);
-        mutex_lock(&tomoyo_policy_lock);
+                entry = kmalloc(sizeof(*entry), GFP_NOFS);
+        if (mutex_lock_interruptible(&tomoyo_policy_lock))
+                goto out;
         list_for_each_entry_rcu(ptr, &tomoyo_domain_keeper_list, list) {
                 if (ptr->is_not != is_not ||
                     ptr->domainname != saved_domainname ||
@@ -565,8 +567,9 @@ static int tomoyo_update_alias_entry(const char *original_name,
         if (!saved_original_name || !saved_aliased_name)
                 goto out;
         if (!is_delete)
-                entry = kmalloc(sizeof(*entry), GFP_KERNEL);
-        mutex_lock(&tomoyo_policy_lock);
+                entry = kmalloc(sizeof(*entry), GFP_NOFS);
+        if (mutex_lock_interruptible(&tomoyo_policy_lock))
+                goto out;
         list_for_each_entry_rcu(ptr, &tomoyo_alias_list, list) {
                 if (ptr->original_name != saved_original_name ||
                     ptr->aliased_name != saved_aliased_name)
@@ -656,7 +659,7 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char *
                                                             const u8 profile)
 {
         struct tomoyo_domain_info *entry;
-        struct tomoyo_domain_info *domain;
+        struct tomoyo_domain_info *domain = NULL;
         const struct tomoyo_path_info *saved_domainname;
         bool found = false;
 
@@ -665,8 +668,9 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char *
         saved_domainname = tomoyo_get_name(domainname);
         if (!saved_domainname)
                 return NULL;
-        entry = kzalloc(sizeof(*entry), GFP_KERNEL);
-        mutex_lock(&tomoyo_policy_lock);
+        entry = kzalloc(sizeof(*entry), GFP_NOFS);
+        if (mutex_lock_interruptible(&tomoyo_policy_lock))
+                goto out;
         list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
                 if (domain->is_deleted ||
                     tomoyo_pathcmp(saved_domainname, domain->domainname))
@@ -685,6 +689,7 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char *
                 found = true;
         }
         mutex_unlock(&tomoyo_policy_lock);
+ out:
         tomoyo_put_name(saved_domainname);
         kfree(entry);
         return found ? domain : NULL;
@@ -705,7 +710,7 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
          * This function assumes that the size of buffer returned by
          * tomoyo_realpath() = TOMOYO_MAX_PATHNAME_LEN.
          */
-        struct tomoyo_page_buffer *tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+        struct tomoyo_page_buffer *tmp = kzalloc(sizeof(*tmp), GFP_NOFS);
         struct tomoyo_domain_info *old_domain = tomoyo_domain();
         struct tomoyo_domain_info *domain = NULL;
         const char *old_domain_name = old_domain->domainname->name;