aboutsummaryrefslogtreecommitdiffstats
path: root/security/tomoyo/path_group.c
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2010-06-17 16:52:29 +0900
committerJames Morris <jmorris@namei.org>2010-08-02 15:34:40 +1000
commita98aa4debe2728abb3353e35fc5d110dcc0d7f0d (patch)
tree0334194761e26961339dd126e997c23e4060ce72 /security/tomoyo/path_group.c
parent5fb49870e6d48d81d8ca0e1ef979073dc9a820f7 (diff)
downloadmrst-s0i3-test-a98aa4debe2728abb3353e35fc5d110dcc0d7f0d.tar.gz
mrst-s0i3-test-a98aa4debe2728abb3353e35fc5d110dcc0d7f0d.tar.xz
mrst-s0i3-test-a98aa4debe2728abb3353e35fc5d110dcc0d7f0d.zip
TOMOYO: Merge tomoyo_path_group and tomoyo_number_group
"struct tomoyo_path_group" and "struct tomoyo_number_group" are identical. Rename tomoyo_path_group/tomoyo_number_group to tomoyo_group and tomoyo_path_group_member to tomoyo_path_group and tomoyo_number_group_member to tomoyo_unmber_group. Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo/path_group.c')
-rw-r--r--security/tomoyo/path_group.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/security/tomoyo/path_group.c b/security/tomoyo/path_group.c
index c78c57cd94e..bce2524402f 100644
--- a/security/tomoyo/path_group.c
+++ b/security/tomoyo/path_group.c
@@ -10,16 +10,16 @@
LIST_HEAD(tomoyo_path_group_list);
/**
- * tomoyo_get_path_group - Allocate memory for "struct tomoyo_path_group".
+ * tomoyo_get_group - Allocate memory for "struct tomoyo_path_group".
*
* @group_name: The name of pathname group.
*
* Returns pointer to "struct tomoyo_path_group" on success, NULL otherwise.
*/
-struct tomoyo_path_group *tomoyo_get_path_group(const char *group_name)
+struct tomoyo_group *tomoyo_get_path_group(const char *group_name)
{
- struct tomoyo_path_group *entry = NULL;
- struct tomoyo_path_group *group = NULL;
+ struct tomoyo_group *entry = NULL;
+ struct tomoyo_group *group = NULL;
const struct tomoyo_path_info *saved_group_name;
int error = -ENOMEM;
if (!tomoyo_correct_word(group_name))
@@ -57,9 +57,9 @@ struct tomoyo_path_group *tomoyo_get_path_group(const char *group_name)
static bool tomoyo_same_path_group(const struct tomoyo_acl_head *a,
const struct tomoyo_acl_head *b)
{
- return container_of(a, struct tomoyo_path_group_member, head)
+ return container_of(a, struct tomoyo_path_group, head)
->member_name ==
- container_of(b, struct tomoyo_path_group_member, head)
+ container_of(b, struct tomoyo_path_group, head)
->member_name;
}
@@ -73,8 +73,8 @@ static bool tomoyo_same_path_group(const struct tomoyo_acl_head *a,
*/
int tomoyo_write_path_group_policy(char *data, const bool is_delete)
{
- struct tomoyo_path_group *group;
- struct tomoyo_path_group_member e = { };
+ struct tomoyo_group *group;
+ struct tomoyo_path_group e = { };
int error = is_delete ? -ENOENT : -ENOMEM;
char *w[2];
if (!tomoyo_tokenize(data, w, sizeof(w)) || !w[1][0])
@@ -90,7 +90,7 @@ int tomoyo_write_path_group_policy(char *data, const bool is_delete)
tomoyo_same_path_group);
out:
tomoyo_put_name(e.member_name);
- tomoyo_put_path_group(group);
+ tomoyo_put_group(group);
return error;
}
@@ -108,13 +108,13 @@ bool tomoyo_read_path_group_policy(struct tomoyo_io_buffer *head)
struct list_head *gpos;
struct list_head *mpos;
list_for_each_cookie(gpos, head->read_var1, &tomoyo_path_group_list) {
- struct tomoyo_path_group *group;
- group = list_entry(gpos, struct tomoyo_path_group, list);
+ struct tomoyo_group *group;
+ group = list_entry(gpos, struct tomoyo_group, list);
list_for_each_cookie(mpos, head->read_var2,
&group->member_list) {
- struct tomoyo_path_group_member *member;
+ struct tomoyo_path_group *member;
member = list_entry(mpos,
- struct tomoyo_path_group_member,
+ struct tomoyo_path_group,
head.list);
if (member->head.is_deleted)
continue;
@@ -139,9 +139,9 @@ bool tomoyo_read_path_group_policy(struct tomoyo_io_buffer *head)
* Caller holds tomoyo_read_lock().
*/
bool tomoyo_path_matches_group(const struct tomoyo_path_info *pathname,
- const struct tomoyo_path_group *group)
+ const struct tomoyo_group *group)
{
- struct tomoyo_path_group_member *member;
+ struct tomoyo_path_group *member;
bool matched = false;
list_for_each_entry_rcu(member, &group->member_list, head.list) {
if (member->head.is_deleted)