1 files changed, 19 insertions, 11 deletions

diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
index 6f3fe76a1fde..060bbf3870ce 100644
--- a/security/tomoyo/file.c
+++ b/security/tomoyo/file.c
@@ -100,7 +100,7 @@ static struct tomoyo_path_info *tomoyo_get_path(struct path *path)
 {
         int error;
         struct tomoyo_path_info_with_data *buf = kzalloc(sizeof(*buf),
-                                                         GFP_KERNEL);
+                                                         GFP_NOFS);
 
         if (!buf)
                 return NULL;
@@ -175,8 +175,9 @@ static int tomoyo_update_globally_readable_entry(const char *filename,
         if (!saved_filename)
                 return -ENOMEM;
         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_globally_readable_list, list) {
                 if (ptr->filename != saved_filename)
                         continue;
@@ -192,6 +193,7 @@ static int tomoyo_update_globally_readable_entry(const char *filename,
                 error = 0;
         }
         mutex_unlock(&tomoyo_policy_lock);
+ out:
         tomoyo_put_name(saved_filename);
         kfree(entry);
         return error;
@@ -322,8 +324,9 @@ static int tomoyo_update_file_pattern_entry(const char *pattern,
         if (!saved_pattern->is_patterned)
                 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_pattern_list, list) {
                 if (saved_pattern != ptr->pattern)
                         continue;
@@ -475,8 +478,9 @@ static int tomoyo_update_no_rewrite_entry(const char *pattern,
         if (!saved_pattern)
                 return error;
         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_no_rewrite_list, list) {
                 if (ptr->pattern != saved_pattern)
                         continue;
@@ -492,6 +496,7 @@ static int tomoyo_update_no_rewrite_entry(const char *pattern,
                 error = 0;
         }
         mutex_unlock(&tomoyo_policy_lock);
+ out:
         tomoyo_put_name(saved_pattern);
         kfree(entry);
         return error;
@@ -821,8 +826,9 @@ static int tomoyo_update_path_acl(const u8 type, const char *filename,
         if (!saved_filename)
                 return -ENOMEM;
         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, &domain->acl_info_list, list) {
                 struct tomoyo_path_acl *acl =
                         container_of(ptr, struct tomoyo_path_acl, head);
@@ -867,6 +873,7 @@ static int tomoyo_update_path_acl(const u8 type, const char *filename,
                 error = 0;
         }
         mutex_unlock(&tomoyo_policy_lock);
+ out:
         kfree(entry);
         tomoyo_put_name(saved_filename);
         return error;
@@ -907,8 +914,9 @@ static int tomoyo_update_path2_acl(const u8 type, const char *filename1,
         if (!saved_filename1 || !saved_filename2)
                 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, &domain->acl_info_list, list) {
                 struct tomoyo_path2_acl *acl =
                         container_of(ptr, struct tomoyo_path2_acl, head);