openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Thiago Jung Bauermann 2019-06-27 20:25:46 -03:00 committed by Mimi Zohar
parent 6a31fcd4cf
commit 337619eb44
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/integrity/ima/ima_template.c
View File

@ -47,7 +47,13 @@ static const struct ima_template_field supported_fields[] = {
{.field_id = "buf", .field_init = ima_eventbuf_init, {.field_id = "buf", .field_init = ima_eventbuf_init,
.field_show = ima_show_template_buf}, .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; static struct ima_template_desc *ima_template;