The patch titled
Subject: ima-support-restoring-multiple-template-formats-v3
has been added to the -mm tree. Its filename is
ima-support-restoring-multiple-template-formats-v3.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ima-support-restoring-multiple-template-formats-v3.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ima-support-restoring-multiple-template-formats-v3.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Subject: ima-support-restoring-multiple-template-formats-v3
Changelog v3:
- initialize template format list in ima_template_desc_current(), as it
might be called during __setup before normal initialization. (kernel
test robot)
- remove __init annotation of ima_init_template_list()
Link: http://lkml.kernel.org/r/1473170584-15094-8-git-send-email-zohar@xxxxxxxxxxxxxxxxxx
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
security/integrity/ima/ima_template.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN security/integrity/ima/ima_template.c~ima-support-restoring-multiple-template-formats-v3 security/integrity/ima/ima_template.c
--- a/security/integrity/ima/ima_template.c~ima-support-restoring-multiple-template-formats-v3
+++ a/security/integrity/ima/ima_template.c
@@ -200,7 +200,7 @@ static int template_desc_init_fields(con
return 0;
}
-void __init ima_init_template_list(void)
+void ima_init_template_list(void)
{
int i;
@@ -218,9 +218,11 @@ void __init ima_init_template_list(void)
struct ima_template_desc *ima_template_desc_current(void)
{
- if (!ima_template)
+ if (!ima_template) {
+ ima_init_template_list();
ima_template =
lookup_template_desc(CONFIG_IMA_DEFAULT_TEMPLATE);
+ }
return ima_template;
}
_
Patches currently in -mm which might be from zohar@xxxxxxxxxxxxxxxxxx are
ima-on-soft-reboot-restore-the-measurement-list.patch
ima-permit-duplicate-measurement-list-entries.patch
ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
ima-maintain-memory-size-needed-for-serializing-the-measurement-list-v3.patch
ima-serialize-the-binary_runtime_measurements.patch
ima-store-the-builtin-custom-template-definitions-in-a-list.patch
ima-store-the-builtin-custom-template-definitions-in-a-list-v3.patch
ima-support-restoring-multiple-template-formats.patch
ima-support-restoring-multiple-template-formats-v3.patch
ima-define-a-canonical-binary_runtime_measurements-list-format.patch
ima-define-a-canonical-binary_runtime_measurements-list-format-v3.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
