TOMOYO: Use callback for updating entries.

Use common code for elements using "struct list_head" + "bool" structure.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 6 insertions, 33 deletions

diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h
index 0ab6e86f90a..c8ab7553c48 100644
--- a/security/tomoyo/common.h
+++ b/security/tomoyo/common.h
@@ -913,6 +913,12 @@ int tomoyo_update_domain(struct tomoyo_acl_info *new_entry, const int size,
                          bool (*merge_duplicate) (struct tomoyo_acl_info *,
                                                   struct tomoyo_acl_info *,
                                                   const bool));
+int tomoyo_update_policy(struct tomoyo_acl_head *new_entry, const int size,
+                         bool is_delete, struct list_head *list,
+                         bool (*check_duplicate) (const struct tomoyo_acl_head
+                                                  *,
+                                                  const struct tomoyo_acl_head
+                                                  *));
 
 /********** External variable definitions. **********/
 
@@ -1042,39 +1048,6 @@ static inline bool tomoyo_is_same_number_union
                 p1->max_type == p2->max_type && p1->is_group == p2->is_group;
 }
 
-static inline bool tomoyo_is_same_domain_initializer_entry
-(const struct tomoyo_domain_initializer_entry *p1,
- const struct tomoyo_domain_initializer_entry *p2)
-{
-        return p1->is_not == p2->is_not && p1->is_last_name == p2->is_last_name
-                && p1->domainname == p2->domainname
-                && p1->program == p2->program;
-}
-
-static inline bool tomoyo_is_same_domain_keeper_entry
-(const struct tomoyo_domain_keeper_entry *p1,
- const struct tomoyo_domain_keeper_entry *p2)
-{
-        return p1->is_not == p2->is_not && p1->is_last_name == p2->is_last_name
-                && p1->domainname == p2->domainname
-                && p1->program == p2->program;
-}
-
-static inline bool tomoyo_is_same_aggregator_entry
-(const struct tomoyo_aggregator_entry *p1,
- const struct tomoyo_aggregator_entry *p2)
-{
-        return p1->original_name == p2->original_name &&
-                p1->aggregated_name == p2->aggregated_name;
-}
-
-static inline bool tomoyo_is_same_alias_entry
-(const struct tomoyo_alias_entry *p1, const struct tomoyo_alias_entry *p2)
-{
-        return p1->original_name == p2->original_name &&
-                p1->aliased_name == p2->aliased_name;
-}
-
 /**
  * list_for_each_cookie - iterate over a list with cookie.
  * @pos:        the &struct list_head to use as a loop cursor.