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

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

TOMOYO: Simplify policy reader. 



We can directly assign the result of tomoyo_io_printf() to done flag.

Signed-off-by: default avatarKentaro Takeda <takedakn@nttdata.co.jp>
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarToshiharu Harada <haradats@nttdata.co.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent ab588cca

security/tomoyo/common.c

+18 −23
Original line number Diff line number Diff line
@@ -1113,11 +1113,10 @@ static int tomoyo_read_manager_policy(struct tomoyo_io_buffer *head) 
				 list);

		if (ptr->is_deleted)

			continue;

		if (!tomoyo_io_printf(head, "%s\n", ptr->manager->name)) {

			done = false;

		done = tomoyo_io_printf(head, "%s\n", ptr->manager->name);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_policy_manager_list_lock);

	head->read_eof = done;

	return 0;
@@ -1441,15 +1440,14 @@ static int tomoyo_read_domain_policy(struct tomoyo_io_buffer *head) 
		    TOMOYO_DOMAIN_FLAGS_IGNORE_GLOBAL_ALLOW_READ)

			ignore_global_allow_read

				= TOMOYO_KEYWORD_IGNORE_GLOBAL_ALLOW_READ "\n";

		if (!tomoyo_io_printf(head,

				      "%s\n" TOMOYO_KEYWORD_USE_PROFILE "%u\n"

				      "%s%s%s\n", domain->domainname->name,

		done = tomoyo_io_printf(head, "%s\n" TOMOYO_KEYWORD_USE_PROFILE

					"%u\n%s%s%s\n",

					domain->domainname->name,

					domain->profile, quota_exceeded,

					transition_failed,

				      ignore_global_allow_read)) {

			done = false;

					ignore_global_allow_read);

		if (!done)

			break;

		}

		head->read_step = 2;

acl_loop:

		if (head->read_step == 3)
@@ -1461,20 +1459,18 @@ acl_loop: 
			struct tomoyo_acl_info *ptr

				= list_entry(apos, struct tomoyo_acl_info,

					     list);

			if (!tomoyo_print_entry(head, ptr)) {

				done = false;

			done = tomoyo_print_entry(head, ptr);

			if (!done)

				break;

		}

		}

		up_read(&tomoyo_domain_acl_info_list_lock);

		if (!done)

			break;

		head->read_step = 3;

tail_mark:

		if (!tomoyo_io_printf(head, "\n")) {

			done = false;

		done = tomoyo_io_printf(head, "\n");

		if (!done)

			break;

		}

		head->read_step = 1;

		if (head->read_single_domain)

			break;
@@ -1544,12 +1540,11 @@ static int tomoyo_read_domain_profile(struct tomoyo_io_buffer *head) 
		domain = list_entry(pos, struct tomoyo_domain_info, list);

		if (domain->is_deleted)

			continue;

		if (!tomoyo_io_printf(head, "%u %s\n", domain->profile,

				      domain->domainname->name)) {

			done = false;

		done = tomoyo_io_printf(head, "%u %s\n", domain->profile,

					domain->domainname->name);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_domain_list_lock);

	head->read_eof = done;

	return 0;

security/tomoyo/domain.c

+14 −17
Original line number Diff line number Diff line
@@ -189,14 +189,13 @@ bool tomoyo_read_domain_initializer_policy(struct tomoyo_io_buffer *head) 
			from = " from ";

			domain = ptr->domainname->name;

		}

		if (!tomoyo_io_printf(head,

		done = tomoyo_io_printf(head,

					"%s" TOMOYO_KEYWORD_INITIALIZE_DOMAIN

				      "%s%s%s\n", no, ptr->program->name, from,

				      domain)) {

			done = false;

					"%s%s%s\n", no, ptr->program->name,

					from, domain);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_domain_initializer_list_lock);

	return done;

}
@@ -387,14 +386,13 @@ bool tomoyo_read_domain_keeper_policy(struct tomoyo_io_buffer *head) 
			from = " from ";

			program = ptr->program->name;

		}

		if (!tomoyo_io_printf(head,

		done = tomoyo_io_printf(head,

					"%s" TOMOYO_KEYWORD_KEEP_DOMAIN

					"%s%s%s\n", no, program, from,

				      ptr->domainname->name)) {

			done = false;

					ptr->domainname->name);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_domain_keeper_list_lock);

	return done;

}
@@ -513,13 +511,12 @@ bool tomoyo_read_alias_policy(struct tomoyo_io_buffer *head) 
		ptr = list_entry(pos, struct tomoyo_alias_entry, list);

		if (ptr->is_deleted)

			continue;

		if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_ALIAS "%s %s\n",

		done = tomoyo_io_printf(head, TOMOYO_KEYWORD_ALIAS "%s %s\n",

					ptr->original_name->name,

				      ptr->aliased_name->name)) {

			done = false;

					ptr->aliased_name->name);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_alias_list_lock);

	return done;

}

security/tomoyo/file.c

+9 −12
Original line number Diff line number Diff line
@@ -247,12 +247,11 @@ bool tomoyo_read_globally_readable_policy(struct tomoyo_io_buffer *head) 
				 list);

		if (ptr->is_deleted)

			continue;

		if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_ALLOW_READ "%s\n",

				      ptr->filename->name)) {

			done = false;

		done = tomoyo_io_printf(head, TOMOYO_KEYWORD_ALLOW_READ "%s\n",

					ptr->filename->name);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_globally_readable_list_lock);

	return done;

}
@@ -369,12 +368,11 @@ bool tomoyo_read_file_pattern(struct tomoyo_io_buffer *head) 
		ptr = list_entry(pos, struct tomoyo_pattern_entry, list);

		if (ptr->is_deleted)

			continue;

		if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_FILE_PATTERN "%s\n",

				      ptr->pattern->name)) {

			done = false;

		done = tomoyo_io_printf(head, TOMOYO_KEYWORD_FILE_PATTERN

					"%s\n", ptr->pattern->name);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_pattern_list_lock);

	return done;

}
@@ -483,12 +481,11 @@ bool tomoyo_read_no_rewrite_policy(struct tomoyo_io_buffer *head) 
		ptr = list_entry(pos, struct tomoyo_no_rewrite_entry, list);

		if (ptr->is_deleted)

			continue;

		if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_DENY_REWRITE "%s\n",

				      ptr->pattern->name)) {

			done = false;

		done = tomoyo_io_printf(head, TOMOYO_KEYWORD_DENY_REWRITE

					"%s\n", ptr->pattern->name);

		if (!done)

			break;

	}

	}

	up_read(&tomoyo_no_rewrite_list_lock);

	return done;

}