From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 19 Apr 2016 21:42:43 +0000 (-0400)
Subject: ima: fix the string representation of the LSM/IMA hook enumeration ordering
X-Git-Tag: v4.6-rc7~27^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf90ea934028375805e2d39c796eb276001574d7;p=thirdparty%2Fkernel%2Flinux.git

ima: fix the string representation of the LSM/IMA hook enumeration ordering

This patch fixes the string representation of the LSM/IMA hook enumeration
ordering used for displaying the IMA policy.

Fixes: d9ddf077bb85 ("ima: support for kexec image and initramfs")
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Tested-by: Eric Richter <erichte@linux.vnet.ibm.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
---

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index be09e2cacf828..3cd0a58672dd1 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -884,10 +884,10 @@ static char *func_tokens[] = {
 	"BPRM_CHECK",
 	"MODULE_CHECK",
 	"FIRMWARE_CHECK",
+	"POST_SETATTR",
 	"KEXEC_KERNEL_CHECK",
 	"KEXEC_INITRAMFS_CHECK",
-	"POLICY_CHECK",
-	"POST_SETATTR"
+	"POLICY_CHECK"
 };
 
 void *ima_policy_start(struct seq_file *m, loff_t *pos)