OSDN > Find Software > System > Operating System Kernels > Linux > AKARI > SCM > SVN > Commit

AKARI

akari: Commit

(empty log message)

--- trunk/akari/policy_io.c (revision 374)

+++ trunk/akari/policy_io.c (revision 375)

		@@ -2815,7 +2815,7 @@
2815	2815	*/
2816	2816	static int ccs_update_policy(const int size, struct ccs_acl_param *param)
2817	2817	{
2818		- struct ccs_acl_head *new_entry = &param->e.acl_head;
	2818	+ struct ccs_acl_head *new_entry = &param->e.acl_head;
2819	2819	int error = param->is_delete ? -ENOENT : -ENOMEM;
2820	2820	struct ccs_acl_head *entry;
2821	2821	struct list_head *list = param->list;

		@@ -3067,7 +3067,7 @@
3067	3067	*/
3068	3068	static int ccs_update_acl(const int size, struct ccs_acl_param *param)
3069	3069	{
3070		- struct ccs_acl_info *new_entry = &param->e.acl_info;
	3070	+ struct ccs_acl_info *new_entry = &param->e.acl_info;
3071	3071	const bool is_delete = param->is_delete;
3072	3072	int error = is_delete ? -ENOENT : -ENOMEM;
3073	3073	struct ccs_acl_info *entry;

		@@ -4261,7 +4261,8 @@
4261	4261	struct ccs_policy_namespace *ns = param->ns;
4262	4262	int error;
4263	4263	u8 *tmp;
4264		- if (param->data[0] == '@' \|\| !ccs_parse_number_union(param, &e->port) \|\|
	4264	+ if (param->data[0] == '@' \|\|
	4265	+ !ccs_parse_number_union(param, &e->port) \|\|
4265	4266	e->port.values[1] > 65535 \|\| param->data[0])
4266	4267	return -EINVAL;
4267	4268	param->list = &ns->policy_list[CCS_ID_RESERVEDPORT];

--- trunk/akari/permission.c (revision 374)

+++ trunk/akari/permission.c (revision 375)

		@@ -143,7 +143,7 @@
143	143
144	144	#endif
145	145
146		-#ifdef CONFIG_CCSECURITY_CAPABILITY
	146	+#ifdef CONFIG_CCSECURITY_CAPABILITY
147	147
148	148	/*
149	149	* Mapping table from "enum ccs_capability_acl_index" to "enum ccs_mac_index".

		@@ -188,7 +188,8 @@
188	188
189	189	/*** SECTION3: Prototype definition section ***/
190	190
191		-bool ccs_dump_page(struct linux_binprm bprm, unsigned long pos, struct ccs_page_dump dump);
	191	+bool ccs_dump_page(struct linux_binprm *bprm, unsigned long pos,
	192	+ struct ccs_page_dump *dump);
192	193	void ccs_get_attributes(struct ccs_obj_info *obj);
193	194
194	195	static bool ccs_alphabet_char(const char c);