Revert "ima: limit file hash setting by user to fix and log modes"

[android-x86/kernel.git] / security / integrity / ima / ima_appraise.c

diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index 7bf8b00..1e6f23f 100644 (file)
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -389,14 +389,10 @@ int ima_inode_setxattr(struct dentry *dentry, const char *xattr_name,
        result = ima_protect_xattr(dentry, xattr_name, xattr_value,
                                   xattr_value_len);
        if (result == 1) {
-               bool digsig;
-
                if (!xattr_value_len || (xvalue->type >= IMA_XATTR_LAST))
                        return -EINVAL;
-               digsig = (xvalue->type == EVM_IMA_XATTR_DIGSIG);
-               if (!digsig && (ima_appraise & IMA_APPRAISE_ENFORCE))
-                       return -EPERM;
-               ima_reset_appraise_flags(d_backing_inode(dentry), digsig);
+               ima_reset_appraise_flags(d_backing_inode(dentry),
+                        (xvalue->type == EVM_IMA_XATTR_DIGSIG) ? 1 : 0);
                result = 0;
        }
        return result;