Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[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 5bbd8b4dc29a66e0d8d0754557adf062b1fa3da1..f9a81b187fae9d1a8aea498cf790f5a08d306c35 100644 (file)
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -166,7 +166,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
        /* check value type */
        switch (xattr_data->type) {
        case EVM_XATTR_HMAC:
-               if (xattr_len != sizeof(struct evm_ima_xattr_data)) {
+               if (xattr_len != sizeof(struct evm_xattr)) {
                        evm_status = INTEGRITY_FAIL;
                        goto out;
                }
@@ -176,7 +176,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
                                   xattr_value_len, &digest);
                if (rc)
                        break;
-               rc = crypto_memneq(xattr_data->digest, digest.digest,
+               rc = crypto_memneq(xattr_data->data, digest.digest,
                                   SHA1_DIGEST_SIZE);
                if (rc)
                        rc = -EINVAL;
@@ -520,7 +520,7 @@ int evm_inode_init_security(struct inode *inode,
                                 const struct xattr *lsm_xattr,
                                 struct xattr *evm_xattr)
 {
-       struct evm_ima_xattr_data *xattr_data;
+       struct evm_xattr *xattr_data;
        int rc;
 
        if (!evm_key_loaded() || !evm_protected_xattr(lsm_xattr->name))
@@ -530,7 +530,7 @@ int evm_inode_init_security(struct inode *inode,
        if (!xattr_data)
                return -ENOMEM;
 
-       xattr_data->type = EVM_XATTR_HMAC;
+       xattr_data->data.type = EVM_XATTR_HMAC;
        rc = evm_init_hmac(inode, lsm_xattr, xattr_data->digest);
        if (rc < 0)
                goto out;