Commit 337619eb authored Jun 27, 2019 by Thiago Jung Bauermann Committed by Mimi Zohar Jun 30, 2019

ima: Update MAX_TEMPLATE_NAME_LEN to fit largest reasonable definition

MAX_TEMPLATE_NAME_LEN is used when restoring measurements carried over from
a kexec. It should be set to the length of a template containing all fields
except for 'd' and 'n', which don't need to be accounted for since they
shouldn't be defined in the same template description as 'd-ng' and 'n-ng'.

That length is greater than the current 15, so update using a sizeof() to
show where the number comes from and also can be visually shown to be
correct. The sizeof() is calculated at compile time.

Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>

parent 6a31fcd4

security/integrity/ima/ima_template.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,13 @@ static const struct ima_template_field supported_fields[] = {
		{.field_id = "buf", .field_init = ima_eventbuf_init,
		.field_show = ima_show_template_buf},
		};
		#define MAX_TEMPLATE_NAME_LEN 15

		/*
		* Used when restoring measurements carried over from a kexec. 'd' and 'n' don't
		* need to be accounted for since they shouldn't be defined in the same template
		* description as 'd-ng' and 'n-ng' respectively.
		*/
		#define MAX_TEMPLATE_NAME_LEN sizeof("d-ng\|n-ng\|sig\|buf")

		static struct ima_template_desc *ima_template;