提交 778c4a4d 编写于 作者: T Tetsuo Handa 提交者: James Morris

TOMOYO: Fix make namespacecheck warnings.

Commit efe836ab "TOMOYO: Add built-in policy support." introduced
tomoyo_load_builtin_policy() but was by error called from nowhere.

Commit b22b8b9f "TOMOYO: Rename meminfo to stat and show more statistics."
introduced tomoyo_update_stat() but was by error not called from
tomoyo_assign_domain().

Also, mark tomoyo_io_printf() and tomoyo_path_permission() static functions,
as reported by "make namespacecheck".
Signed-off-by: NTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: NJames Morris <jmorris@namei.org>
上级 6bce98ed
...@@ -262,13 +262,17 @@ static void tomoyo_set_string(struct tomoyo_io_buffer *head, const char *string) ...@@ -262,13 +262,17 @@ static void tomoyo_set_string(struct tomoyo_io_buffer *head, const char *string)
WARN_ON(1); WARN_ON(1);
} }
static void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt,
...) __printf(2, 3);
/** /**
* tomoyo_io_printf - printf() to "struct tomoyo_io_buffer" structure. * tomoyo_io_printf - printf() to "struct tomoyo_io_buffer" structure.
* *
* @head: Pointer to "struct tomoyo_io_buffer". * @head: Pointer to "struct tomoyo_io_buffer".
* @fmt: The printf()'s format string, followed by parameters. * @fmt: The printf()'s format string, followed by parameters.
*/ */
void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...) static void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt,
...)
{ {
va_list args; va_list args;
size_t len; size_t len;
......
...@@ -978,8 +978,6 @@ int tomoyo_path_number_perm(const u8 operation, struct path *path, ...@@ -978,8 +978,6 @@ int tomoyo_path_number_perm(const u8 operation, struct path *path,
unsigned long number); unsigned long number);
int tomoyo_path_perm(const u8 operation, struct path *path, int tomoyo_path_perm(const u8 operation, struct path *path,
const char *target); const char *target);
int tomoyo_path_permission(struct tomoyo_request_info *r, u8 operation,
const struct tomoyo_path_info *filename);
int tomoyo_poll_control(struct file *file, poll_table *wait); int tomoyo_poll_control(struct file *file, poll_table *wait);
int tomoyo_poll_log(struct file *file, poll_table *wait); int tomoyo_poll_log(struct file *file, poll_table *wait);
int tomoyo_socket_bind_permission(struct socket *sock, struct sockaddr *addr, int tomoyo_socket_bind_permission(struct socket *sock, struct sockaddr *addr,
...@@ -1041,8 +1039,6 @@ void tomoyo_del_condition(struct list_head *element); ...@@ -1041,8 +1039,6 @@ void tomoyo_del_condition(struct list_head *element);
void tomoyo_fill_path_info(struct tomoyo_path_info *ptr); void tomoyo_fill_path_info(struct tomoyo_path_info *ptr);
void tomoyo_get_attributes(struct tomoyo_obj_info *obj); void tomoyo_get_attributes(struct tomoyo_obj_info *obj);
void tomoyo_init_policy_namespace(struct tomoyo_policy_namespace *ns); void tomoyo_init_policy_namespace(struct tomoyo_policy_namespace *ns);
void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...)
__printf(2, 3);
void tomoyo_load_policy(const char *filename); void tomoyo_load_policy(const char *filename);
void tomoyo_memory_free(void *ptr); void tomoyo_memory_free(void *ptr);
void tomoyo_normalize_line(unsigned char *buffer); void tomoyo_normalize_line(unsigned char *buffer);
......
...@@ -567,6 +567,7 @@ struct tomoyo_domain_info *tomoyo_assign_domain(const char *domainname, ...@@ -567,6 +567,7 @@ struct tomoyo_domain_info *tomoyo_assign_domain(const char *domainname,
tomoyo_write_log(&r, "use_profile %u\n", tomoyo_write_log(&r, "use_profile %u\n",
entry->profile); entry->profile);
tomoyo_write_log(&r, "use_group %u\n", entry->group); tomoyo_write_log(&r, "use_group %u\n", entry->group);
tomoyo_update_stat(TOMOYO_STAT_POLICY_UPDATES);
} }
} }
return entry; return entry;
......
...@@ -555,8 +555,8 @@ static int tomoyo_update_path2_acl(const u8 perm, ...@@ -555,8 +555,8 @@ static int tomoyo_update_path2_acl(const u8 perm,
* *
* Caller holds tomoyo_read_lock(). * Caller holds tomoyo_read_lock().
*/ */
int tomoyo_path_permission(struct tomoyo_request_info *r, u8 operation, static int tomoyo_path_permission(struct tomoyo_request_info *r, u8 operation,
const struct tomoyo_path_info *filename) const struct tomoyo_path_info *filename)
{ {
int error; int error;
......
...@@ -265,6 +265,7 @@ static int __init tomoyo_initerface_init(void) ...@@ -265,6 +265,7 @@ static int __init tomoyo_initerface_init(void)
TOMOYO_VERSION); TOMOYO_VERSION);
securityfs_create_file("self_domain", 0666, tomoyo_dir, NULL, securityfs_create_file("self_domain", 0666, tomoyo_dir, NULL,
&tomoyo_self_operations); &tomoyo_self_operations);
tomoyo_load_builtin_policy();
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册