[GIT PULL] Security subsystem - IMA fix for v4.6

[James Morris]

Please pull this fix for the IMA code.

The following changes since commit 83858a701cf3271f81dd321c2a81e5666c6ca8f4:

  Merge tag 'trace-fixes-v4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (2016-05-03 18:02:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

Mimi Zohar (1):
      ima: fix the string representation of the LSM/IMA hook enumeration ordering

 security/integrity/ima/ima_policy.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

---

commit cf90ea934028375805e2d39c796eb276001574d7
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date:   Tue Apr 19 17:42:43 2016 -0400

    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@xxxxxxxxxxxxxxxxxx>
    Tested-by: Eric Richter <erichte@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: James Morris <james.l.morris@xxxxxxxxxx>

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index be09e2c..3cd0a58 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)