diff options
author | Huang, Tao <huangtao@rock-chips.com> | 2016-02-18 16:03:29 +0800 |
---|---|---|
committer | Huang, Tao <huangtao@rock-chips.com> | 2016-02-18 16:03:29 +0800 |
commit | fbcc24698c3040c28f358bc7ffb669290309d63f (patch) | |
tree | 0656dae30f5da9d53ead57b1cc18e65dbc83acaa /security | |
parent | 5f478558d45d6000e960faa8e27a68515fe3daa3 (diff) | |
parent | 1cb8570bf04ab12a03c31c397a4d158f24895d9c (diff) |
Merge tag 'v4.4.2'
This is the 4.4.2 stable release
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/evm/evm_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index 1334e02ae8f4..3d145a3ffccf 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c @@ -23,6 +23,7 @@ #include <linux/integrity.h> #include <linux/evm.h> #include <crypto/hash.h> +#include <crypto/algapi.h> #include "evm.h" int evm_initialized; @@ -148,7 +149,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, xattr_value_len, calc.digest); if (rc) break; - rc = memcmp(xattr_data->digest, calc.digest, + rc = crypto_memneq(xattr_data->digest, calc.digest, sizeof(calc.digest)); if (rc) rc = -EINVAL; |