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

Commit b4148db5 authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by Mimi Zohar
Browse files

ima: initialize only required template 



IMA uses only one template. This patch initializes only required
template to avoid unnecessary memory allocations.

Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
Reviewed-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent 17f4bad3

security/integrity/ima/ima_template.c

+4 −24
Original line number Diff line number Diff line
@@ -152,24 +152,6 @@ static int template_desc_init_fields(const char *template_fmt, 
	return result;

}



static int __init init_defined_templates(void)

{

	int i = 0;

	int result = 0;



	/* Init defined templates. */

	for (i = 0; i < ARRAY_SIZE(defined_templates); i++) {

		struct ima_template_desc *template = &defined_templates[i];



		result = template_desc_init_fields(template->fmt,

						   &(template->fields),

						   &(template->num_fields));

		if (result < 0)

			return result;

	}

	return result;

}



struct ima_template_desc *ima_template_desc_current(void)

{

	if (!ima_template)
@@ -180,11 +162,9 @@ struct ima_template_desc *ima_template_desc_current(void) 


int __init ima_init_template(void)

{

	int result;

	struct ima_template_desc *template = ima_template_desc_current();



	result = init_defined_templates();

	if (result < 0)

		return result;



	return 0;

	return template_desc_init_fields(template->fmt,

					 &(template->fields),

					 &(template->num_fields));

}