4 files changed, 44 insertions, 2 deletions

diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index e099875643c5..b0840f9a552f 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -131,3 +131,21 @@ config IMA_TRUSTED_KEYRING
         help
            This option requires that all keys added to the .ima
            keyring be signed by a key on the system trusted keyring.
+
+config IMA_LOAD_X509
+        bool "Load X509 certificate onto the '.ima' trusted keyring"
+        depends on IMA_TRUSTED_KEYRING
+        default n
+        help
+           File signature verification is based on the public keys
+           loaded on the .ima trusted keyring. These public keys are
+           X509 certificates signed by a trusted key on the
+           .system keyring.  This option enables X509 certificate
+           loading from the kernel onto the '.ima' trusted keyring.
+
+config IMA_X509_PATH
+        string "IMA X509 certificate path"
+        depends on IMA_LOAD_X509
+        default "/etc/keys/x509_ima.der"
+        help
+           This option defines IMA X509 certificate path.
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index a99eb6d4bc09..b0dc922d8be3 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -173,8 +173,7 @@ int ima_get_action(struct inode *inode, int mask, int function)
 {
         int flags = IMA_MEASURE | IMA_AUDIT | IMA_APPRAISE;
 
-        if (!ima_appraise)
-                flags &= ~IMA_APPRAISE;
+        flags &= ima_policy_flag;
 
         return ima_match_policy(inode, function, mask, flags);
 }
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index 9164fc8cac84..5e4c29d174ee 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -24,6 +24,12 @@
 #include <crypto/hash_info.h>
 #include "ima.h"
 
+#ifdef CONFIG_IMA_X509_PATH
+#define IMA_X509_PATH   CONFIG_IMA_X509_PATH
+#else
+#define IMA_X509_PATH   "/etc/keys/x509_ima.der"
+#endif
+
 /* name for boot aggregate entry */
 static const char *boot_aggregate_name = "boot_aggregate";
 int ima_used_chip;
@@ -91,6 +97,17 @@ err_out:
         return result;
 }
 
+#ifdef CONFIG_IMA_LOAD_X509
+void __init ima_load_x509(void)
+{
+        int unset_flags = ima_policy_flag & IMA_APPRAISE;
+
+        ima_policy_flag &= ~unset_flags;
+        integrity_load_x509(INTEGRITY_KEYRING_IMA, IMA_X509_PATH);
+        ima_policy_flag |= unset_flags;
+}
+#endif
+
 int __init ima_init(void)
 {
         u8 pcr_i[TPM_DIGEST_SIZE];
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 1057abbd31cd..caa1f6ca72e9 100644
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -162,6 +162,14 @@ static inline int asymmetric_verify(struct key *keyring, const char *sig,
 }
 #endif
 
+#ifdef CONFIG_IMA_LOAD_X509
+void __init ima_load_x509(void);
+#else
+static inline void ima_load_x509(void)
+{
+}
+#endif
+
 #ifdef CONFIG_INTEGRITY_AUDIT
 /* declarations */
 void integrity_audit_msg(int audit_msgno, struct inode *inode,