diff options
Diffstat (limited to 'security/tomoyo/path_group.c')
-rw-r--r-- | security/tomoyo/path_group.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/security/tomoyo/path_group.c b/security/tomoyo/path_group.c index 07e4f782367b..7838f7681297 100644 --- a/security/tomoyo/path_group.c +++ b/security/tomoyo/path_group.c | |||
@@ -79,10 +79,10 @@ int tomoyo_write_path_group_policy(char *data, const bool is_delete) | |||
79 | goto out; | 79 | goto out; |
80 | if (mutex_lock_interruptible(&tomoyo_policy_lock)) | 80 | if (mutex_lock_interruptible(&tomoyo_policy_lock)) |
81 | goto out; | 81 | goto out; |
82 | list_for_each_entry_rcu(member, &group->member_list, list) { | 82 | list_for_each_entry_rcu(member, &group->member_list, head.list) { |
83 | if (member->member_name != e.member_name) | 83 | if (member->member_name != e.member_name) |
84 | continue; | 84 | continue; |
85 | member->is_deleted = is_delete; | 85 | member->head.is_deleted = is_delete; |
86 | error = 0; | 86 | error = 0; |
87 | break; | 87 | break; |
88 | } | 88 | } |
@@ -90,7 +90,8 @@ int tomoyo_write_path_group_policy(char *data, const bool is_delete) | |||
90 | struct tomoyo_path_group_member *entry = | 90 | struct tomoyo_path_group_member *entry = |
91 | tomoyo_commit_ok(&e, sizeof(e)); | 91 | tomoyo_commit_ok(&e, sizeof(e)); |
92 | if (entry) { | 92 | if (entry) { |
93 | list_add_tail_rcu(&entry->list, &group->member_list); | 93 | list_add_tail_rcu(&entry->head.list, |
94 | &group->member_list); | ||
94 | error = 0; | 95 | error = 0; |
95 | } | 96 | } |
96 | } | 97 | } |
@@ -122,8 +123,8 @@ bool tomoyo_read_path_group_policy(struct tomoyo_io_buffer *head) | |||
122 | struct tomoyo_path_group_member *member; | 123 | struct tomoyo_path_group_member *member; |
123 | member = list_entry(mpos, | 124 | member = list_entry(mpos, |
124 | struct tomoyo_path_group_member, | 125 | struct tomoyo_path_group_member, |
125 | list); | 126 | head.list); |
126 | if (member->is_deleted) | 127 | if (member->head.is_deleted) |
127 | continue; | 128 | continue; |
128 | if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_PATH_GROUP | 129 | if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_PATH_GROUP |
129 | "%s %s\n", | 130 | "%s %s\n", |
@@ -150,8 +151,8 @@ bool tomoyo_path_matches_group(const struct tomoyo_path_info *pathname, | |||
150 | { | 151 | { |
151 | struct tomoyo_path_group_member *member; | 152 | struct tomoyo_path_group_member *member; |
152 | bool matched = false; | 153 | bool matched = false; |
153 | list_for_each_entry_rcu(member, &group->member_list, list) { | 154 | list_for_each_entry_rcu(member, &group->member_list, head.list) { |
154 | if (member->is_deleted) | 155 | if (member->head.is_deleted) |
155 | continue; | 156 | continue; |
156 | if (!tomoyo_path_matches_pattern(pathname, | 157 | if (!tomoyo_path_matches_pattern(pathname, |
157 | member->member_name)) | 158 | member->member_name)) |