Commit da062855 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tomoyo-pr-20201214' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1 

Pull tomoyo updates from Tetsuo Handa:
 "Limit recursion depth, fix clang warning, fix comment typo, and
  silence memory allocation failure warning"

* tag 'tomoyo-pr-20201214' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
  tomoyo: Fix typo in comments.
  tomoyo: Fix null pointer check
  tomoyo: Limit wildcard recursion depth.
  tomoyo: fix clang pointer arithmetic warning
  tomoyo: Loosen pathname/domainname validation.
parents fab0fca1 15269fb1

security/tomoyo/audit.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static LIST_HEAD(tomoyo_log); 
/* Lock for "struct list_head tomoyo_log". */

static DEFINE_SPINLOCK(tomoyo_log_lock);



/* Length of "stuct list_head tomoyo_log". */

/* Length of "struct list_head tomoyo_log". */

static unsigned int tomoyo_log_count;



/**

security/tomoyo/common.c

+4 −4
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static struct tomoyo_profile *tomoyo_assign_profile 
	ptr = ns->profile_ptr[profile];

	if (ptr)

		return ptr;

	entry = kzalloc(sizeof(*entry), GFP_NOFS);

	entry = kzalloc(sizeof(*entry), GFP_NOFS | __GFP_NOWARN);

	if (mutex_lock_interruptible(&tomoyo_policy_lock))

		goto out;

	ptr = ns->profile_ptr[profile];
@@ -635,7 +635,7 @@ static int tomoyo_set_mode(char *name, const char *value, 
			if (strstr(value, tomoyo_mode[mode]))

				/*

				 * Update lower 3 bits in order to distinguish

				 * 'config' from 'TOMOYO_CONFIG_USE_DEAFULT'.

				 * 'config' from 'TOMOYO_CONFIG_USE_DEFAULT'.

				 */

				config = (config & ~7) | mode;

		if (config != TOMOYO_CONFIG_USE_DEFAULT) {
@@ -2574,7 +2574,7 @@ static inline bool tomoyo_has_more_namespace(struct tomoyo_io_buffer *head) 
 * tomoyo_read_control - read() for /sys/kernel/security/tomoyo/ interface.

 *

 * @head:       Pointer to "struct tomoyo_io_buffer".

 * @buffer:     Poiner to buffer to write to.

 * @buffer:     Pointer to buffer to write to.

 * @buffer_len: Size of @buffer.

 *

 * Returns bytes read on success, negative value otherwise.
@@ -2608,7 +2608,7 @@ ssize_t tomoyo_read_control(struct tomoyo_io_buffer *head, char __user *buffer, 
/**

 * tomoyo_parse_policy - Parse a policy line.

 *

 * @head: Poiter to "struct tomoyo_io_buffer".

 * @head: Pointer to "struct tomoyo_io_buffer".

 * @line: Line to parse.

 *

 * Returns 0 on success, negative value otherwise.

security/tomoyo/condition.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static bool tomoyo_envp(const char *env_name, const char *env_value, 
 * @argc: Length of @argc.

 * @argv: Pointer to "struct tomoyo_argv".

 * @envc: Length of @envp.

 * @envp: Poiner to "struct tomoyo_envp".

 * @envp: Pointer to "struct tomoyo_envp".

 *

 * Returns true on success, false otherwise.

 */

security/tomoyo/domain.c

+2 −4
Original line number Diff line number Diff line
@@ -473,9 +473,7 @@ struct tomoyo_policy_namespace *tomoyo_assign_namespace(const char *domainname) 
		return ptr;

	if (len >= TOMOYO_EXEC_TMPSIZE - 10 || !tomoyo_domain_def(domainname))

		return NULL;

	entry = kzalloc(sizeof(*entry) + len + 1, GFP_NOFS);

	if (!entry)

		return NULL;

	entry = kzalloc(sizeof(*entry) + len + 1, GFP_NOFS | __GFP_NOWARN);

	if (mutex_lock_interruptible(&tomoyo_policy_lock))

		goto out;

	ptr = tomoyo_find_namespace(domainname, len);
@@ -891,7 +889,7 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm) 
 *

 * @bprm: Pointer to "struct linux_binprm".

 * @pos:  Location to dump.

 * @dump: Poiner to "struct tomoyo_page_dump".

 * @dump: Pointer to "struct tomoyo_page_dump".

 *

 * Returns true on success, false otherwise.

 */

security/tomoyo/gc.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static void tomoyo_try_to_gc(const enum tomoyo_policy_id type, 
	return;

reinject:

	/*

	 * We can safely reinject this element here bacause

	 * We can safely reinject this element here because

	 * (1) Appending list elements and removing list elements are protected

	 *     by tomoyo_policy_lock mutex.

	 * (2) Only this function removes list elements and this function is