Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 778c4a4d authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

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: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 6bce98ed

security/tomoyo/common.c

+5 −1
Original line number Diff line number Diff line
@@ -262,13 +262,17 @@ static void tomoyo_set_string(struct tomoyo_io_buffer *head, const char *string) 
		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.

 *

 * @head: Pointer to "struct tomoyo_io_buffer".

 * @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;

	size_t len;

security/tomoyo/common.h

+0 −4
Original line number Diff line number Diff line
@@ -978,8 +978,6 @@ int tomoyo_path_number_perm(const u8 operation, struct path *path, 
			    unsigned long number);

int tomoyo_path_perm(const u8 operation, struct path *path,

		     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_log(struct file *file, poll_table *wait);

int tomoyo_socket_bind_permission(struct socket *sock, struct sockaddr *addr,
@@ -1041,8 +1039,6 @@ void tomoyo_del_condition(struct list_head *element); 
void tomoyo_fill_path_info(struct tomoyo_path_info *ptr);

void tomoyo_get_attributes(struct tomoyo_obj_info *obj);

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_memory_free(void *ptr);

void tomoyo_normalize_line(unsigned char *buffer);

security/tomoyo/domain.c

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ out: 
			tomoyo_write_log(&r, "use_profile %u\n",

					 entry->profile);

			tomoyo_write_log(&r, "use_group %u\n", entry->group);

			tomoyo_update_stat(TOMOYO_STAT_POLICY_UPDATES);

		}

	}

	return entry;

security/tomoyo/file.c

+2 −2
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int tomoyo_update_path2_acl(const u8 perm, 
 *

 * 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)

{

	int error;

security/tomoyo/securityfs_if.c

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static int __init tomoyo_initerface_init(void) 
			    TOMOYO_VERSION);

	securityfs_create_file("self_domain", 0666, tomoyo_dir, NULL,

			       &tomoyo_self_operations);

	tomoyo_load_builtin_policy();

	return 0;

}