summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorTycho Andersen <tycho@docker.com>2017-05-05 19:15:47 +0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2017-06-21 20:37:12 +0200
commit5d659f286d58d76064168c4cd7aad61a30d20c44 (patch)
treea9dd63c0609577b062bf48e81ae0166e46e67031 /security
parentIMA: Correct Kconfig dependencies for hash selection (diff)
downloadlinux-5d659f286d58d76064168c4cd7aad61a30d20c44.tar.xz
linux-5d659f286d58d76064168c4cd7aad61a30d20c44.zip
ima: fix up #endif comments
While reading the code, I noticed that these #endif comments don't match how they're actually nested. This patch fixes that. Signed-off-by: Tycho Andersen <tycho@docker.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index b563fbd4d122..d26a30e37d13 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -306,12 +306,12 @@ static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,
{
return -EINVAL;
}
-#endif /* CONFIG_IMA_TRUSTED_KEYRING */
+#endif /* CONFIG_IMA_LSM_RULES */
#ifdef CONFIG_IMA_READ_POLICY
#define POLICY_FILE_FLAGS (S_IWUSR | S_IRUSR)
#else
#define POLICY_FILE_FLAGS S_IWUSR
-#endif /* CONFIG_IMA_WRITE_POLICY */
+#endif /* CONFIG_IMA_READ_POLICY */
#endif /* __LINUX_IMA_H */