ima: define '.ima' as a builtin 'trusted' keyring

[mirror_ubuntu-artful-kernel.git] / security / integrity / ima / ima.h

diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index f79fa8be203cd3703ad1a7fedddfe7037f602cdd..c42056edfc97699a7e85d7c1826614ef3686981f 100644 (file)
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -249,4 +249,16 @@ static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,
        return -EINVAL;
 }
 #endif /* CONFIG_IMA_LSM_RULES */
+
+#ifdef CONFIG_IMA_TRUSTED_KEYRING
+static inline int ima_init_keyring(const unsigned int id)
+{
+       return integrity_init_keyring(id);
+}
+#else
+static inline int ima_init_keyring(const unsigned int id)
+{
+       return 0;
+}
+#endif /* CONFIG_IMA_TRUSTED_KEYRING */
 #endif