Re: [Linux-ima-devel] [PATCH 8/8] ima: initialize only required template

[Roberto Sassu <roberto.sassu@polito.it>]

On 09/03/2014 09:20 AM, Dmitry Kasatkin wrote:
> IMA uses only one template. This patch initializes only required
> template to avoid unnecessary memory allocations.
>
> Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
> ---
>   security/integrity/ima/ima_template.c | 28 ++++------------------------
>   1 file changed, 4 insertions(+), 24 deletions(-)
>
> diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
> index f682606..e854862 100644
> --- a/security/integrity/ima/ima_template.c
> +++ b/security/integrity/ima/ima_template.c
> @@ -152,24 +152,6 @@ out:
>   	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;
> -
> -	result = init_defined_templates();
> -	if (result < 0)
> -		return result;
> +	struct ima_template_desc *template = ima_template_desc_current();
>
> -	return 0;
> +	return template_desc_init_fields(template->fmt,
> +					 &(template->fields),
> +					 &(template->num_fields));

Hi Dmitry

ok, I'm fine with the change even if the template
initialization routine will be used for other purposes
(array items will be added in a linked list to permit
templates dynamic registration).

Thanks

Roberto Sassu


>   }
>