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

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

TOMOYO: Remove __func__ from tomoyo_is_correct_path/domain 



__func__ is used for only debug printk(). We can remove it.

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 2da5d31b

security/tomoyo/common.c

+4 −14
Original line number Diff line number Diff line
@@ -179,14 +179,12 @@ static void tomoyo_normalize_line(unsigned char *buffer) 
 *                1 = must / -1 = must not / 0 = don't care

 * @end_type:     Should the pathname end with '/'?

 *                1 = must / -1 = must not / 0 = don't care

 * @function:     The name of function calling me.

 *

 * Check whether the given filename follows the naming rules.

 * Returns true if @filename follows the naming rules, false otherwise.

 */

bool tomoyo_is_correct_path(const char *filename, const s8 start_type,

			    const s8 pattern_type, const s8 end_type,

			    const char *function)

			    const s8 pattern_type, const s8 end_type)

{

	const char *const start = filename;

	bool in_repetition = false;
@@ -194,7 +192,6 @@ bool tomoyo_is_correct_path(const char *filename, const s8 start_type, 
	unsigned char c;

	unsigned char d;

	unsigned char e;

	const char *original_filename = filename;



	if (!filename)

		goto out;
@@ -283,25 +280,20 @@ bool tomoyo_is_correct_path(const char *filename, const s8 start_type, 
		goto out;

	return true;

 out:

	printk(KERN_DEBUG "%s: Invalid pathname '%s'\n", function,

	       original_filename);

	return false;

}



/**

 * tomoyo_is_correct_domain - Check whether the given domainname follows the naming rules.

 * @domainname:   The domainname to check.

 * @function:     The name of function calling me.

 *

 * Returns true if @domainname follows the naming rules, false otherwise.

 */

bool tomoyo_is_correct_domain(const unsigned char *domainname,

			      const char *function)

bool tomoyo_is_correct_domain(const unsigned char *domainname)

{

	unsigned char c;

	unsigned char d;

	unsigned char e;

	const char *org_domainname = domainname;



	if (!domainname || strncmp(domainname, TOMOYO_ROOT_NAME,

				   TOMOYO_ROOT_NAME_LEN))
@@ -344,8 +336,6 @@ bool tomoyo_is_correct_domain(const unsigned char *domainname, 
	} while (*domainname);

	return true;

 out:

	printk(KERN_DEBUG "%s: Invalid domainname '%s'\n", function,

	       org_domainname);

	return false;

}
@@ -1086,11 +1076,11 @@ static int tomoyo_update_manager_entry(const char *manager, 
	bool is_domain = false;



	if (tomoyo_is_domain_def(manager)) {

		if (!tomoyo_is_correct_domain(manager, __func__))

		if (!tomoyo_is_correct_domain(manager))

			return -EINVAL;

		is_domain = true;

	} else {

		if (!tomoyo_is_correct_path(manager, 1, -1, -1, __func__))

		if (!tomoyo_is_correct_path(manager, 1, -1, -1))

			return -EINVAL;

	}

	saved_manager = tomoyo_get_name(manager);

security/tomoyo/common.h

+2 −4
Original line number Diff line number Diff line
@@ -520,12 +520,10 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_domain_info * const domain); 
bool tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...)

	__attribute__ ((format(printf, 2, 3)));

/* Check whether the domainname is correct. */

bool tomoyo_is_correct_domain(const unsigned char *domainname,

			      const char *function);

bool tomoyo_is_correct_domain(const unsigned char *domainname);

/* Check whether the token is correct. */

bool tomoyo_is_correct_path(const char *filename, const s8 start_type,

			    const s8 pattern_type, const s8 end_type,

			    const char *function);

			    const s8 pattern_type, const s8 end_type);

/* Check whether the token can be a domainname. */

bool tomoyo_is_domain_def(const unsigned char *buffer);

/* Check whether the given filename matches the given pattern. */

security/tomoyo/domain.c

+9 −9
Original line number Diff line number Diff line
@@ -136,13 +136,13 @@ static int tomoyo_update_domain_initializer_entry(const char *domainname, 
	int error = is_delete ? -ENOENT : -ENOMEM;

	bool is_last_name = false;



	if (!tomoyo_is_correct_path(program, 1, -1, -1, __func__))

	if (!tomoyo_is_correct_path(program, 1, -1, -1))

		return -EINVAL; /* No patterns allowed. */

	if (domainname) {

		if (!tomoyo_is_domain_def(domainname) &&

		    tomoyo_is_correct_path(domainname, 1, -1, -1, __func__))

		    tomoyo_is_correct_path(domainname, 1, -1, -1))

			is_last_name = true;

		else if (!tomoyo_is_correct_domain(domainname, __func__))

		else if (!tomoyo_is_correct_domain(domainname))

			return -EINVAL;

		saved_domainname = tomoyo_get_name(domainname);

		if (!saved_domainname)
@@ -357,12 +357,12 @@ static int tomoyo_update_domain_keeper_entry(const char *domainname, 
	bool is_last_name = false;



	if (!tomoyo_is_domain_def(domainname) &&

	    tomoyo_is_correct_path(domainname, 1, -1, -1, __func__))

	    tomoyo_is_correct_path(domainname, 1, -1, -1))

		is_last_name = true;

	else if (!tomoyo_is_correct_domain(domainname, __func__))

	else if (!tomoyo_is_correct_domain(domainname))

		return -EINVAL;

	if (program) {

		if (!tomoyo_is_correct_path(program, 1, -1, -1, __func__))

		if (!tomoyo_is_correct_path(program, 1, -1, -1))

			return -EINVAL;

		saved_program = tomoyo_get_name(program);

		if (!saved_program)
@@ -556,8 +556,8 @@ static int tomoyo_update_alias_entry(const char *original_name, 
	const struct tomoyo_path_info *saved_aliased_name;

	int error = is_delete ? -ENOENT : -ENOMEM;



	if (!tomoyo_is_correct_path(original_name, 1, -1, -1, __func__) ||

	    !tomoyo_is_correct_path(aliased_name, 1, -1, -1, __func__))

	if (!tomoyo_is_correct_path(original_name, 1, -1, -1) ||

	    !tomoyo_is_correct_path(aliased_name, 1, -1, -1))

		return -EINVAL; /* No patterns allowed. */

	saved_original_name = tomoyo_get_name(original_name);

	saved_aliased_name = tomoyo_get_name(aliased_name);
@@ -659,7 +659,7 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char * 
	const struct tomoyo_path_info *saved_domainname;

	bool found = false;



	if (!tomoyo_is_correct_domain(domainname, __func__))

	if (!tomoyo_is_correct_domain(domainname))

		return NULL;

	saved_domainname = tomoyo_get_name(domainname);

	if (!saved_domainname)

security/tomoyo/file.c

+5 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int tomoyo_update_globally_readable_entry(const char *filename, 
	const struct tomoyo_path_info *saved_filename;

	int error = is_delete ? -ENOENT : -ENOMEM;



	if (!tomoyo_is_correct_path(filename, 1, 0, -1, __func__))

	if (!tomoyo_is_correct_path(filename, 1, 0, -1))

		return -EINVAL;

	saved_filename = tomoyo_get_name(filename);

	if (!saved_filename)
@@ -468,7 +468,7 @@ static int tomoyo_update_no_rewrite_entry(const char *pattern, 
	const struct tomoyo_path_info *saved_pattern;

	int error = is_delete ? -ENOENT : -ENOMEM;



	if (!tomoyo_is_correct_path(pattern, 0, 0, 0, __func__))

	if (!tomoyo_is_correct_path(pattern, 0, 0, 0))

		return -EINVAL;

	saved_pattern = tomoyo_get_name(pattern);

	if (!saved_pattern)
@@ -814,7 +814,7 @@ static int tomoyo_update_path_acl(const u8 type, const char *filename, 


	if (!domain)

		return -EINVAL;

	if (!tomoyo_is_correct_path(filename, 0, 0, 0, __func__))

	if (!tomoyo_is_correct_path(filename, 0, 0, 0))

		return -EINVAL;

	saved_filename = tomoyo_get_name(filename);

	if (!saved_filename)
@@ -898,8 +898,8 @@ static int tomoyo_update_path2_acl(const u8 type, const char *filename1, 


	if (!domain)

		return -EINVAL;

	if (!tomoyo_is_correct_path(filename1, 0, 0, 0, __func__) ||

	    !tomoyo_is_correct_path(filename2, 0, 0, 0, __func__))

	if (!tomoyo_is_correct_path(filename1, 0, 0, 0) ||

	    !tomoyo_is_correct_path(filename2, 0, 0, 0))

		return -EINVAL;

	saved_filename1 = tomoyo_get_name(filename1);

	saved_filename2 = tomoyo_get_name(filename2);