diff options
| author | Chris Mason | 2016-05-17 23:43:19 +0200 |
|---|---|---|
| committer | Chris Mason | 2016-05-17 23:43:19 +0200 |
| commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
| tree | 501e1fc558de9e56b78e457aa928fa255e660486 /security | |
| parent | Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Btrfs: add semaphore to synchronize direct IO writes with fsync (diff) | |
| download | kernel-qcow2-linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.gz kernel-qcow2-linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.xz kernel-qcow2-linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.zip | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'security')
| -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[] = { "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) |