evm: Enforce signatures on unsupported filesystem for EVM_INIT_X509

[linux-2.6-block.git] / security / integrity / evm / evm_main.c

diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index c1ca0894cd8a792d94cb1eef8fb162d8882c8a8f..cfb4f980936951f14d98a16f8c723442a85a8086 100644 (file)
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -192,7 +192,11 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
                     iint->evm_status == INTEGRITY_PASS_IMMUTABLE))
                return iint->evm_status;
 
-       if (is_unsupported_fs(dentry))
+       /*
+        * On unsupported filesystems without EVM_INIT_X509 enabled, skip
+        * signature verification.
+        */
+       if (!(evm_initialized & EVM_INIT_X509) && is_unsupported_fs(dentry))
                return INTEGRITY_UNKNOWN;
 
        /* if status is not PASS, try to check again - against -ENOMEM */
@@ -261,7 +265,8 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
                                evm_status = INTEGRITY_PASS_IMMUTABLE;
                        } else if (!IS_RDONLY(inode) &&
                                   !(inode->i_sb->s_readonly_remount) &&
-                                  !IS_IMMUTABLE(inode)) {
+                                  !IS_IMMUTABLE(inode) &&
+                                  !is_unsupported_fs(dentry)) {
                                evm_update_evmxattr(dentry, xattr_name,
                                                    xattr_value,
                                                    xattr_value_len);
@@ -419,9 +424,6 @@ enum integrity_status evm_verifyxattr(struct dentry *dentry,
        if (!evm_key_loaded() || !evm_protected_xattr(xattr_name))
                return INTEGRITY_UNKNOWN;
 
-       if (is_unsupported_fs(dentry))
-               return INTEGRITY_UNKNOWN;
-
        return evm_verify_hmac(dentry, xattr_name, xattr_value,
                                 xattr_value_len);
 }