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

Commit 89e51f2a authored by Roberto Sassu's avatar Roberto Sassu Committed by Greg Kroah-Hartman
Browse files

ima: Allow template selection with ima_template[_fmt]= after ima_hash= 



commit bb8e52e4906f148c2faf6656b5106cf7233e9301 upstream.

Commit c2426d2a ("ima: added support for new kernel cmdline parameter
ima_template_fmt") introduced an additional check on the ima_template
variable to avoid multiple template selection.

Unfortunately, ima_template could be also set by the setup function of the
ima_hash= parameter, when it calls ima_template_desc_current(). This causes
attempts to choose a new template with ima_template= or with
ima_template_fmt=, after ima_hash=, to be ignored.

Achieve the goal of the commit mentioned with the new static variable
template_setup_done, so that template selection requests after ima_hash=
are not ignored.

Finally, call ima_init_template_list(), if not already done, to initialize
the list of templates before lookup_template_desc() is called.

Reported-by: default avatarGuo Zihua <guozihua@huawei.com>
Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Cc: stable@vger.kernel.org
Fixes: c2426d2a ("ima: added support for new kernel cmdline parameter ima_template_fmt")
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0939988b

security/integrity/ima/ima_template.c

+7 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ static struct ima_template_desc builtin_templates[] = { 


static LIST_HEAD(defined_templates);

static DEFINE_SPINLOCK(template_list);

static int template_setup_done;



static const struct ima_template_field supported_fields[] = {

	{.field_id = "d", .field_init = ima_eventdigest_init,
@@ -82,9 +83,10 @@ static int __init ima_template_setup(char *str) 
	struct ima_template_desc *template_desc;

	int template_len = strlen(str);



	if (ima_template)

	if (template_setup_done)

		return 1;



	if (!ima_template)

		ima_init_template_list();



	/*
@@ -109,6 +111,7 @@ static int __init ima_template_setup(char *str) 
	}



	ima_template = template_desc;

	template_setup_done = 1;

	return 1;

}

__setup("ima_template=", ima_template_setup);
@@ -117,7 +120,7 @@ static int __init ima_template_fmt_setup(char *str) 
{

	int num_templates = ARRAY_SIZE(builtin_templates);



	if (ima_template)

	if (template_setup_done)

		return 1;



	if (template_desc_init_fields(str, NULL, NULL) < 0) {
@@ -128,6 +131,7 @@ static int __init ima_template_fmt_setup(char *str) 


	builtin_templates[num_templates - 1].fmt = str;

	ima_template = builtin_templates + num_templates - 1;

	template_setup_done = 1;



	return 1;

}