Commit 7c2ea22e authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

TOMOYO: Merge path_group and number_group.



Use common code for "path_group" and "number_group".
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 31845e8c
obj-y = common.o domain.o file.o gc.o load_policy.o memory.o mount.o number_group.o path_group.o realpath.o securityfs_if.o tomoyo.o util.o obj-y = common.o domain.o file.o gc.o group.o load_policy.o memory.o mount.o realpath.o securityfs_if.o tomoyo.o util.o
...@@ -1186,9 +1186,9 @@ static int tomoyo_write_exception_policy(struct tomoyo_io_buffer *head) ...@@ -1186,9 +1186,9 @@ static int tomoyo_write_exception_policy(struct tomoyo_io_buffer *head)
if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_DENY_REWRITE)) if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_DENY_REWRITE))
return tomoyo_write_no_rewrite_policy(data, is_delete); return tomoyo_write_no_rewrite_policy(data, is_delete);
if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_PATH_GROUP)) if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_PATH_GROUP))
return tomoyo_write_path_group_policy(data, is_delete); return tomoyo_write_group(data, is_delete, TOMOYO_PATH_GROUP);
if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_NUMBER_GROUP)) if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_NUMBER_GROUP))
return tomoyo_write_number_group_policy(data, is_delete); return tomoyo_write_group(data, is_delete, TOMOYO_NUMBER_GROUP);
return -EINVAL; return -EINVAL;
} }
......
...@@ -838,12 +838,10 @@ int tomoyo_write_mount_policy(char *data, struct tomoyo_domain_info *domain, ...@@ -838,12 +838,10 @@ int tomoyo_write_mount_policy(char *data, struct tomoyo_domain_info *domain,
int tomoyo_write_no_rewrite_policy(char *data, const bool is_delete); int tomoyo_write_no_rewrite_policy(char *data, const bool is_delete);
/* Create "file_pattern" entry in exception policy. */ /* Create "file_pattern" entry in exception policy. */
int tomoyo_write_pattern_policy(char *data, const bool is_delete); int tomoyo_write_pattern_policy(char *data, const bool is_delete);
/* Create "path_group" entry in exception policy. */ /* Create "path_group"/"number_group" entry in exception policy. */
int tomoyo_write_path_group_policy(char *data, const bool is_delete); int tomoyo_write_group(char *data, const bool is_delete, const u8 type);
int tomoyo_supervisor(struct tomoyo_request_info *r, const char *fmt, ...) int tomoyo_supervisor(struct tomoyo_request_info *r, const char *fmt, ...)
__attribute__ ((format(printf, 2, 3))); __attribute__ ((format(printf, 2, 3)));
/* Create "number_group" entry in exception policy. */
int tomoyo_write_number_group_policy(char *data, const bool is_delete);
/* Find a domain by the given name. */ /* Find a domain by the given name. */
struct tomoyo_domain_info *tomoyo_find_domain(const char *domainname); struct tomoyo_domain_info *tomoyo_find_domain(const char *domainname);
/* Find or create a domain by the given name. */ /* Find or create a domain by the given name. */
...@@ -851,9 +849,10 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char * ...@@ -851,9 +849,10 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char *
domainname, domainname,
const u8 profile); const u8 profile);
struct tomoyo_profile *tomoyo_profile(const u8 profile); struct tomoyo_profile *tomoyo_profile(const u8 profile);
/* Allocate memory for "struct tomoyo_path_group". */ /*
struct tomoyo_group *tomoyo_get_path_group(const char *group_name); * Allocate memory for "struct tomoyo_path_group"/"struct tomoyo_number_group".
struct tomoyo_group *tomoyo_get_number_group(const char *group_name); */
struct tomoyo_group *tomoyo_get_group(const char *group_name, const u8 type);
/* Check mode for specified functionality. */ /* Check mode for specified functionality. */
unsigned int tomoyo_check_flags(const struct tomoyo_domain_info *domain, unsigned int tomoyo_check_flags(const struct tomoyo_domain_info *domain,
......
...@@ -266,33 +266,25 @@ static void tomoyo_collect_entry(void) ...@@ -266,33 +266,25 @@ static void tomoyo_collect_entry(void)
goto unlock; goto unlock;
} }
} }
{ for (i = 0; i < TOMOYO_MAX_GROUP; i++) {
struct list_head *list = &tomoyo_group_list[i];
int id;
struct tomoyo_group *group; struct tomoyo_group *group;
list_for_each_entry_rcu(group, switch (i) {
&tomoyo_group_list[TOMOYO_PATH_GROUP], case 0:
list) { id = TOMOYO_ID_PATH_GROUP;
tomoyo_collect_member(&group->member_list, break;
TOMOYO_ID_PATH_GROUP); default:
if (!list_empty(&group->member_list) || id = TOMOYO_ID_NUMBER_GROUP;
atomic_read(&group->users)) break;
continue;
if (!tomoyo_add_to_gc(TOMOYO_ID_GROUP,
&group->list))
goto unlock;
} }
} list_for_each_entry(group, list, list) {
{ if (!tomoyo_collect_member(&group->member_list, id))
struct tomoyo_group *group; goto unlock;
list_for_each_entry_rcu(group,
&tomoyo_group_list[TOMOYO_NUMBER_GROUP],
list) {
tomoyo_collect_member(&group->member_list,
TOMOYO_ID_NUMBER_GROUP);
if (!list_empty(&group->member_list) || if (!list_empty(&group->member_list) ||
atomic_read(&group->users)) atomic_read(&group->users))
continue; continue;
if (!tomoyo_add_to_gc(TOMOYO_ID_GROUP, if (!tomoyo_add_to_gc(TOMOYO_ID_GROUP, &group->list))
&group->list))
goto unlock; goto unlock;
} }
} }
......
/* /*
* security/tomoyo/number_group.c * security/tomoyo/group.c
* *
* Copyright (C) 2005-2009 NTT DATA CORPORATION * Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include <linux/slab.h> #include <linux/slab.h>
#include "common.h" #include "common.h"
/** static bool tomoyo_same_path_group(const struct tomoyo_acl_head *a,
* tomoyo_get_group - Allocate memory for "struct tomoyo_number_group". const struct tomoyo_acl_head *b)
*
* @group_name: The name of number group.
*
* Returns pointer to "struct tomoyo_number_group" on success,
* NULL otherwise.
*/
struct tomoyo_group *tomoyo_get_number_group(const char *group_name)
{ {
struct tomoyo_group *entry = NULL; return container_of(a, struct tomoyo_path_group, head)->member_name ==
struct tomoyo_group *group = NULL; container_of(b, struct tomoyo_path_group, head)->member_name;
const struct tomoyo_path_info *saved_group_name;
int error = -ENOMEM;
if (!tomoyo_correct_word(group_name))
return NULL;
saved_group_name = tomoyo_get_name(group_name);
if (!saved_group_name)
return NULL;
entry = kzalloc(sizeof(*entry), GFP_NOFS);
if (mutex_lock_interruptible(&tomoyo_policy_lock))
goto out;
list_for_each_entry_rcu(group, &tomoyo_group_list[TOMOYO_NUMBER_GROUP],
list) {
if (saved_group_name != group->group_name)
continue;
atomic_inc(&group->users);
error = 0;
break;
}
if (error && tomoyo_memory_ok(entry)) {
INIT_LIST_HEAD(&entry->member_list);
entry->group_name = saved_group_name;
saved_group_name = NULL;
atomic_set(&entry->users, 1);
list_add_tail_rcu(&entry->list,
&tomoyo_group_list[TOMOYO_NUMBER_GROUP]);
group = entry;
entry = NULL;
error = 0;
}
mutex_unlock(&tomoyo_policy_lock);
out:
tomoyo_put_name(saved_group_name);
kfree(entry);
return !error ? group : NULL;
} }
static bool tomoyo_same_number_group(const struct tomoyo_acl_head *a, static bool tomoyo_same_number_group(const struct tomoyo_acl_head *a,
const struct tomoyo_acl_head *b) const struct tomoyo_acl_head *b)
{ {
return !memcmp(&container_of(a, struct tomoyo_number_group, return !memcmp(&container_of(a, struct tomoyo_number_group, head)
head)->number, ->number,
&container_of(b, struct tomoyo_number_group, &container_of(b, struct tomoyo_number_group, head)
head)->number, ->number,
sizeof(container_of(a, sizeof(container_of(a, struct tomoyo_number_group, head)
struct tomoyo_number_group, ->number));
head)->number));
} }
/** /**
* tomoyo_write_number_group_policy - Write "struct tomoyo_number_group" list. * tomoyo_write_group - Write "struct tomoyo_path_group"/"struct tomoyo_number_group" list.
* *
* @data: String to parse. * @data: String to parse.
* @is_delete: True if it is a delete request. * @is_delete: True if it is a delete request.
* @type: Type of this group.
* *
* Returns 0 on success, nagative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
int tomoyo_write_number_group_policy(char *data, const bool is_delete) int tomoyo_write_group(char *data, const bool is_delete, const u8 type)
{ {
struct tomoyo_group *group; struct tomoyo_group *group;
struct tomoyo_number_group e = { }; struct list_head *member;
int error;
char *w[2]; char *w[2];
if (!tomoyo_tokenize(data, w, sizeof(w))) int error = -EINVAL;
return -EINVAL; if (!tomoyo_tokenize(data, w, sizeof(w)) || !w[1][0])
if (w[1][0] == '@' || !tomoyo_parse_number_union(w[1], &e.number) ||
e.number.values[0] > e.number.values[1])
return -EINVAL; return -EINVAL;
group = tomoyo_get_number_group(w[0]); group = tomoyo_get_group(w[0], type);
if (!group) if (!group)
return -ENOMEM; return -ENOMEM;
error = tomoyo_update_policy(&e.head, sizeof(e), is_delete, member = &group->member_list;
&group->member_list, if (type == TOMOYO_PATH_GROUP) {
tomoyo_same_number_group); struct tomoyo_path_group e = { };
e.member_name = tomoyo_get_name(w[1]);
if (!e.member_name) {
error = -ENOMEM;
goto out;
}
error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
member, tomoyo_same_path_group);
tomoyo_put_name(e.member_name);
} else if (type == TOMOYO_NUMBER_GROUP) {
struct tomoyo_number_group e = { };
if (w[1][0] == '@'
|| !tomoyo_parse_number_union(w[1], &e.number)
|| e.number.values[0] > e.number.values[1])
goto out;
error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
member, tomoyo_same_number_group);
/*
* tomoyo_put_number_union() is not needed because
* w[1][0] != '@'.
*/
}
out:
tomoyo_put_group(group); tomoyo_put_group(group);
return error; return error;
} }
/**
* tomoyo_path_matches_group - Check whether the given pathname matches members of the given pathname group.
*
* @pathname: The name of pathname.
* @group: Pointer to "struct tomoyo_path_group".
*
* Returns true if @pathname matches pathnames in @group, false otherwise.
*
* Caller holds tomoyo_read_lock().
*/
bool tomoyo_path_matches_group(const struct tomoyo_path_info *pathname,
const struct tomoyo_group *group)
{
struct tomoyo_path_group *member;
bool matched = false;
list_for_each_entry_rcu(member, &group->member_list, head.list) {
if (member->head.is_deleted)
continue;
if (!tomoyo_path_matches_pattern(pathname, member->member_name))
continue;
matched = true;
break;
}
return matched;
}
/** /**
* tomoyo_number_matches_group - Check whether the given number matches members of the given number group. * tomoyo_number_matches_group - Check whether the given number matches members of the given number group.
* *
......
...@@ -89,6 +89,50 @@ void tomoyo_memory_free(void *ptr) ...@@ -89,6 +89,50 @@ void tomoyo_memory_free(void *ptr)
kfree(ptr); kfree(ptr);
} }
/**
* tomoyo_get_group - Allocate memory for "struct tomoyo_path_group"/"struct tomoyo_number_group".
*
* @group_name: The name of address group.
* @idx: Index number.
*
* Returns pointer to "struct tomoyo_group" on success, NULL otherwise.
*/
struct tomoyo_group *tomoyo_get_group(const char *group_name, const u8 idx)
{
struct tomoyo_group e = { };
struct tomoyo_group *group = NULL;
bool found = false;
if (!tomoyo_correct_word(group_name) || idx >= TOMOYO_MAX_GROUP)
return NULL;
e.group_name = tomoyo_get_name(group_name);
if (!e.group_name)
return NULL;
if (mutex_lock_interruptible(&tomoyo_policy_lock))
goto out;
list_for_each_entry(group, &tomoyo_group_list[idx], list) {
if (e.group_name != group->group_name)
continue;
atomic_inc(&group->users);
found = true;
break;
}
if (!found) {
struct tomoyo_group *entry = tomoyo_commit_ok(&e, sizeof(e));
if (entry) {
INIT_LIST_HEAD(&entry->member_list);
atomic_set(&entry->users, 1);
list_add_tail_rcu(&entry->list,
&tomoyo_group_list[idx]);
group = entry;
found = true;
}
}
mutex_unlock(&tomoyo_policy_lock);
out:
tomoyo_put_name(e.group_name);
return found ? group : NULL;
}
/* /*
* tomoyo_name_list is used for holding string data used by TOMOYO. * tomoyo_name_list is used for holding string data used by TOMOYO.
* Since same string data is likely used for multiple times (e.g. * Since same string data is likely used for multiple times (e.g.
......
/*
* security/tomoyo/path_group.c
*
* Copyright (C) 2005-2009 NTT DATA CORPORATION
*/
#include <linux/slab.h>
#include "common.h"
/**
* 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_group *tomoyo_get_path_group(const char *group_name)
{
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))
return NULL;
saved_group_name = tomoyo_get_name(group_name);
if (!saved_group_name)
return NULL;
entry = kzalloc(sizeof(*entry), GFP_NOFS);
if (mutex_lock_interruptible(&tomoyo_policy_lock))
goto out;
list_for_each_entry_rcu(group, &tomoyo_group_list[TOMOYO_PATH_GROUP],
list) {
if (saved_group_name != group->group_name)
continue;
atomic_inc(&group->users);
error = 0;
break;
}
if (error && tomoyo_memory_ok(entry)) {
INIT_LIST_HEAD(&entry->member_list);
entry->group_name = saved_group_name;
saved_group_name = NULL;
atomic_set(&entry->users, 1);
list_add_tail_rcu(&entry->list,
&tomoyo_group_list[TOMOYO_PATH_GROUP]);
group = entry;
entry = NULL;
error = 0;
}
mutex_unlock(&tomoyo_policy_lock);
out:
tomoyo_put_name(saved_group_name);
kfree(entry);
return !error ? group : NULL;
}
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, head)
->member_name ==
container_of(b, struct tomoyo_path_group, head)
->member_name;
}
/**
* tomoyo_write_path_group_policy - Write "struct tomoyo_path_group" list.
*
* @data: String to parse.
* @is_delete: True if it is a delete request.
*
* Returns 0 on success, nagative value otherwise.
*/
int tomoyo_write_path_group_policy(char *data, const bool is_delete)
{
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])
return -EINVAL;
group = tomoyo_get_path_group(w[0]);
if (!group)
return -ENOMEM;
e.member_name = tomoyo_get_name(w[1]);
if (!e.member_name)
goto out;
error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
&group->member_list,
tomoyo_same_path_group);
out:
tomoyo_put_name(e.member_name);
tomoyo_put_group(group);
return error;
}
/**
* tomoyo_path_matches_group - Check whether the given pathname matches members of the given pathname group.
*
* @pathname: The name of pathname.
* @group: Pointer to "struct tomoyo_path_group".
*
* Returns true if @pathname matches pathnames in @group, false otherwise.
*
* Caller holds tomoyo_read_lock().
*/
bool tomoyo_path_matches_group(const struct tomoyo_path_info *pathname,
const struct tomoyo_group *group)
{
struct tomoyo_path_group *member;
bool matched = false;
list_for_each_entry_rcu(member, &group->member_list, head.list) {
if (member->head.is_deleted)
continue;
if (!tomoyo_path_matches_pattern(pathname,
member->member_name))
continue;
matched = true;
break;
}
return matched;
}
...@@ -92,7 +92,7 @@ bool tomoyo_parse_name_union(const char *filename, ...@@ -92,7 +92,7 @@ bool tomoyo_parse_name_union(const char *filename,
if (!tomoyo_correct_word(filename)) if (!tomoyo_correct_word(filename))
return false; return false;
if (filename[0] == '@') { if (filename[0] == '@') {
ptr->group = tomoyo_get_path_group(filename + 1); ptr->group = tomoyo_get_group(filename + 1, TOMOYO_PATH_GROUP);
ptr->is_group = true; ptr->is_group = true;
return ptr->group != NULL; return ptr->group != NULL;
} }
...@@ -117,7 +117,7 @@ bool tomoyo_parse_number_union(char *data, struct tomoyo_number_union *num) ...@@ -117,7 +117,7 @@ bool tomoyo_parse_number_union(char *data, struct tomoyo_number_union *num)
if (data[0] == '@') { if (data[0] == '@') {
if (!tomoyo_correct_word(data)) if (!tomoyo_correct_word(data))
return false; return false;
num->group = tomoyo_get_number_group(data + 1); num->group = tomoyo_get_group(data + 1, TOMOYO_NUMBER_GROUP);
num->is_group = true; num->is_group = true;
return num->group != NULL; return num->group != NULL;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment