Commit 4810d968 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull IMA fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ima: fix the string representation of the LSM/IMA hook enumeration ordering
parents 41143b77 cf90ea93
...@@ -884,10 +884,10 @@ static char *func_tokens[] = { ...@@ -884,10 +884,10 @@ static char *func_tokens[] = {
"BPRM_CHECK", "BPRM_CHECK",
"MODULE_CHECK", "MODULE_CHECK",
"FIRMWARE_CHECK", "FIRMWARE_CHECK",
"POST_SETATTR",
"KEXEC_KERNEL_CHECK", "KEXEC_KERNEL_CHECK",
"KEXEC_INITRAMFS_CHECK", "KEXEC_INITRAMFS_CHECK",
"POLICY_CHECK", "POLICY_CHECK"
"POST_SETATTR"
}; };
void *ima_policy_start(struct seq_file *m, loff_t *pos) void *ima_policy_start(struct seq_file *m, loff_t *pos)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment