Commit 5c5e0e81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tomoyo updates from Tetsuo Handa:
 "Three cleanup patches, no behavior changes"

* tag 'tomoyo-pr-20230903' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
  tomoyo: remove unused function declaration
  tomoyo: refactor deprecated strncpy
  tomoyo: add format attributes to functions
parents 708283ab 254a8ed6

security/tomoyo/common.c

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ static bool tomoyo_manage_by_non_root; 
 *

 * Returns nothing.

 */

__printf(3, 4)

static void tomoyo_addprintf(char *buffer, int len, const char *fmt, ...)

{

	va_list args;

security/tomoyo/common.h

+2 −4
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ bool tomoyo_str_starts(char **src, const char *find); 
char *tomoyo_encode(const char *str);

char *tomoyo_encode2(const char *str, int str_len);

char *tomoyo_init_log(struct tomoyo_request_info *r, int len, const char *fmt,

		      va_list args);

		      va_list args) __printf(3, 0);

char *tomoyo_read_token(struct tomoyo_acl_param *param);

char *tomoyo_realpath_from_path(const struct path *path);

char *tomoyo_realpath_nofollow(const char *pathname);
@@ -1037,8 +1037,6 @@ struct tomoyo_policy_namespace *tomoyo_assign_namespace 
(const char *domainname);

struct tomoyo_profile *tomoyo_profile(const struct tomoyo_policy_namespace *ns,

				      const u8 profile);

unsigned int tomoyo_check_flags(const struct tomoyo_domain_info *domain,

				const u8 index);

u8 tomoyo_parse_ulong(unsigned long *result, char **str);

void *tomoyo_commit_ok(void *data, const unsigned int size);

void __init tomoyo_load_builtin_policy(void);
@@ -1067,7 +1065,7 @@ void tomoyo_warn_oom(const char *function); 
void tomoyo_write_log(struct tomoyo_request_info *r, const char *fmt, ...)

	__printf(2, 3);

void tomoyo_write_log2(struct tomoyo_request_info *r, int len, const char *fmt,

		       va_list args);

		       va_list args) __printf(3, 0);



/********** External variable definitions. **********/

security/tomoyo/domain.c

+2 −3
Original line number Diff line number Diff line
@@ -784,13 +784,12 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm) 
		if (!strcmp(domainname, "parent")) {

			char *cp;



			strncpy(ee->tmp, old_domain->domainname->name,

				TOMOYO_EXEC_TMPSIZE - 1);

			strscpy(ee->tmp, old_domain->domainname->name, TOMOYO_EXEC_TMPSIZE);

			cp = strrchr(ee->tmp, ' ');

			if (cp)

				*cp = '\0';

		} else if (*domainname == '<')

			strncpy(ee->tmp, domainname, TOMOYO_EXEC_TMPSIZE - 1);

			strscpy(ee->tmp, domainname, TOMOYO_EXEC_TMPSIZE);

		else

			snprintf(ee->tmp, TOMOYO_EXEC_TMPSIZE - 1, "%s %s",

				 old_domain->domainname->name, domainname);