diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-04 14:14:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-04 14:14:00 -0400 |
| commit | 4810d9682971e8eee659f96e4f9d9154e3c6c0b4 (patch) | |
| tree | 80a19f6ab582122f8d8f85256a2869f3a83e9edf | |
| parent | 41143b774af2b37c24026521e6eae4c914bd731d (diff) | |
| parent | cf90ea934028375805e2d39c796eb276001574d7 (diff) | |
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
| -rw-r--r-- | security/integrity/ima/ima_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index be09e2cacf82..3cd0a58672dd 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c | |||
| @@ -884,10 +884,10 @@ static char *func_tokens[] = { | |||
| 884 | "BPRM_CHECK", | 884 | "BPRM_CHECK", |
| 885 | "MODULE_CHECK", | 885 | "MODULE_CHECK", |
| 886 | "FIRMWARE_CHECK", | 886 | "FIRMWARE_CHECK", |
| 887 | "POST_SETATTR", | ||
| 887 | "KEXEC_KERNEL_CHECK", | 888 | "KEXEC_KERNEL_CHECK", |
| 888 | "KEXEC_INITRAMFS_CHECK", | 889 | "KEXEC_INITRAMFS_CHECK", |
| 889 | "POLICY_CHECK", | 890 | "POLICY_CHECK" |
| 890 | "POST_SETATTR" | ||
| 891 | }; | 891 | }; |
| 892 | 892 | ||
| 893 | void *ima_policy_start(struct seq_file *m, loff_t *pos) | 893 | void *ima_policy_start(struct seq_file *m, loff_t *pos) |