TOMOYO: Use common structure for list element.

[deliverable/linux.git] / security / tomoyo / gc.c

diff --git a/security/tomoyo/gc.c b/security/tomoyo/gc.c
index be2d3b935533bc06cb7a08f4bdae5ec64890b8bb..2dd9665af260596ac58259b98b06b5402723e8f7 100644 (file)
--- a/security/tomoyo/gc.c
+++ b/security/tomoyo/gc.c
@@ -18,6 +18,7 @@ enum tomoyo_gc_id {
        TOMOYO_ID_NUMBER_GROUP_MEMBER,
        TOMOYO_ID_DOMAIN_INITIALIZER,
        TOMOYO_ID_DOMAIN_KEEPER,
+       TOMOYO_ID_AGGREGATOR,
        TOMOYO_ID_ALIAS,
        TOMOYO_ID_GLOBALLY_READABLE,
        TOMOYO_ID_PATTERN,
@@ -77,6 +78,12 @@ static void tomoyo_del_domain_keeper(struct tomoyo_domain_keeper_entry *ptr)
        tomoyo_put_name(ptr->program);
 }
 
+static void tomoyo_del_aggregator(struct tomoyo_aggregator_entry *ptr)
+{
+       tomoyo_put_name(ptr->original_name);
+       tomoyo_put_name(ptr->aggregated_name);
+}
+
 static void tomoyo_del_alias(struct tomoyo_alias_entry *ptr)
 {
        tomoyo_put_name(ptr->original_name);
@@ -209,33 +216,34 @@ static void tomoyo_collect_entry(void)
        {
                struct tomoyo_globally_readable_file_entry *ptr;
                list_for_each_entry_rcu(ptr, &tomoyo_globally_readable_list,
-                                       list) {
-                       if (!ptr->is_deleted)
+                                       head.list) {
+                       if (!ptr->head.is_deleted)
                                continue;
                        if (tomoyo_add_to_gc(TOMOYO_ID_GLOBALLY_READABLE, ptr))
-                               list_del_rcu(&ptr->list);
+                               list_del_rcu(&ptr->head.list);
                        else
                                break;
                }
        }
        {
                struct tomoyo_pattern_entry *ptr;
-               list_for_each_entry_rcu(ptr, &tomoyo_pattern_list, list) {
-                       if (!ptr->is_deleted)
+               list_for_each_entry_rcu(ptr, &tomoyo_pattern_list, head.list) {
+                       if (!ptr->head.is_deleted)
                                continue;
                        if (tomoyo_add_to_gc(TOMOYO_ID_PATTERN, ptr))
-                               list_del_rcu(&ptr->list);
+                               list_del_rcu(&ptr->head.list);
                        else
                                break;
                }
        }
        {
                struct tomoyo_no_rewrite_entry *ptr;
-               list_for_each_entry_rcu(ptr, &tomoyo_no_rewrite_list, list) {
-                       if (!ptr->is_deleted)
+               list_for_each_entry_rcu(ptr, &tomoyo_no_rewrite_list,
+                                       head.list) {
+                       if (!ptr->head.is_deleted)
                                continue;
                        if (tomoyo_add_to_gc(TOMOYO_ID_NO_REWRITE, ptr))
-                               list_del_rcu(&ptr->list);
+                               list_del_rcu(&ptr->head.list);
                        else
                                break;
                }
@@ -243,33 +251,46 @@ static void tomoyo_collect_entry(void)
        {
                struct tomoyo_domain_initializer_entry *ptr;
                list_for_each_entry_rcu(ptr, &tomoyo_domain_initializer_list,
-                                       list) {
-                       if (!ptr->is_deleted)
+                                       head.list) {
+                       if (!ptr->head.is_deleted)
                                continue;
                        if (tomoyo_add_to_gc(TOMOYO_ID_DOMAIN_INITIALIZER, ptr))
-                               list_del_rcu(&ptr->list);
+                               list_del_rcu(&ptr->head.list);
                        else
                                break;
                }
        }
        {
                struct tomoyo_domain_keeper_entry *ptr;
-               list_for_each_entry_rcu(ptr, &tomoyo_domain_keeper_list, list) {
-                       if (!ptr->is_deleted)
+               list_for_each_entry_rcu(ptr, &tomoyo_domain_keeper_list,
+                                       head.list) {
+                       if (!ptr->head.is_deleted)
                                continue;
                        if (tomoyo_add_to_gc(TOMOYO_ID_DOMAIN_KEEPER, ptr))
-                               list_del_rcu(&ptr->list);
+                               list_del_rcu(&ptr->head.list);
+                       else
+                               break;
+               }
+       }
+       {
+               struct tomoyo_aggregator_entry *ptr;
+               list_for_each_entry_rcu(ptr, &tomoyo_aggregator_list,
+                                       head.list) {
+                       if (!ptr->head.is_deleted)
+                               continue;
+                       if (tomoyo_add_to_gc(TOMOYO_ID_AGGREGATOR, ptr))
+                               list_del_rcu(&ptr->head.list);
                        else
                                break;
                }
        }
        {
                struct tomoyo_alias_entry *ptr;
-               list_for_each_entry_rcu(ptr, &tomoyo_alias_list, list) {
-                       if (!ptr->is_deleted)
+               list_for_each_entry_rcu(ptr, &tomoyo_alias_list, head.list) {
+                       if (!ptr->head.is_deleted)
                                continue;
                        if (tomoyo_add_to_gc(TOMOYO_ID_ALIAS, ptr))
-                               list_del_rcu(&ptr->list);
+                               list_del_rcu(&ptr->head.list);
                        else
                                break;
                }
@@ -277,11 +298,11 @@ static void tomoyo_collect_entry(void)
        {
                struct tomoyo_policy_manager_entry *ptr;
                list_for_each_entry_rcu(ptr, &tomoyo_policy_manager_list,
-                                       list) {
-                       if (!ptr->is_deleted)
+                                       head.list) {
+                       if (!ptr->head.is_deleted)
                                continue;
                        if (tomoyo_add_to_gc(TOMOYO_ID_MANAGER, ptr))
-                               list_del_rcu(&ptr->list);
+                               list_del_rcu(&ptr->head.list);
                        else
                                break;
                }
@@ -292,34 +313,8 @@ static void tomoyo_collect_entry(void)
                        struct tomoyo_acl_info *acl;
                        list_for_each_entry_rcu(acl, &domain->acl_info_list,
                                                list) {
-                               switch (acl->type) {
-                               case TOMOYO_TYPE_PATH_ACL:
-                                       if (container_of(acl,
-                                        struct tomoyo_path_acl,
-                                                        head)->perm)
-                                               continue;
-                                       break;
-                               case TOMOYO_TYPE_PATH2_ACL:
-                                       if (container_of(acl,
-                                        struct tomoyo_path2_acl,
-                                                        head)->perm)
-                                               continue;
-                                       break;
-                               case TOMOYO_TYPE_PATH_NUMBER_ACL:
-                                       if (container_of(acl,
-                                        struct tomoyo_path_number_acl,
-                                                        head)->perm)
-                                               continue;
-                                       break;
-                               case TOMOYO_TYPE_PATH_NUMBER3_ACL:
-                                       if (container_of(acl,
-                                        struct tomoyo_path_number3_acl,
-                                                        head)->perm)
-                                               continue;
-                                       break;
-                               default:
+                               if (!acl->is_deleted)
                                        continue;
-                               }
                                if (tomoyo_add_to_gc(TOMOYO_ID_ACL, acl))
                                        list_del_rcu(&acl->list);
                                else
@@ -360,12 +355,12 @@ static void tomoyo_collect_entry(void)
                list_for_each_entry_rcu(group, &tomoyo_path_group_list, list) {
                        struct tomoyo_path_group_member *member;
                        list_for_each_entry_rcu(member, &group->member_list,
-                                               list) {
-                               if (!member->is_deleted)
+                                               head.list) {
+                               if (!member->head.is_deleted)
                                        continue;
                                if (tomoyo_add_to_gc(TOMOYO_ID_PATH_GROUP_MEMBER,
                                                     member))
-                                       list_del_rcu(&member->list);
+                                       list_del_rcu(&member->head.list);
                                else
                                        break;
                        }
@@ -383,12 +378,12 @@ static void tomoyo_collect_entry(void)
                list_for_each_entry_rcu(group, &tomoyo_number_group_list, list) {
                        struct tomoyo_number_group_member *member;
                        list_for_each_entry_rcu(member, &group->member_list,
-                                               list) {
-                               if (!member->is_deleted)
+                                               head.list) {
+                               if (!member->head.is_deleted)
                                        continue;
                                if (tomoyo_add_to_gc(TOMOYO_ID_NUMBER_GROUP_MEMBER,
                                                     member))
-                                       list_del_rcu(&member->list);
+                                       list_del_rcu(&member->head.list);
                                else
                                        break;
                        }
@@ -417,6 +412,9 @@ static void tomoyo_kfree_entry(void)
                case TOMOYO_ID_DOMAIN_KEEPER:
                        tomoyo_del_domain_keeper(p->element);
                        break;
+               case TOMOYO_ID_AGGREGATOR:
+                       tomoyo_del_aggregator(p->element);
+                       break;
                case TOMOYO_ID_ALIAS:
                        tomoyo_del_alias(p->element);
                        break;