Commit df8c2723 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://

Pull crypto fix from James Morris.

* 'for-linus' of git://
  EVM: Use crypto_memneq() for digest comparisons
parents 27c9d772 613317bd
......@@ -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)
rc = memcmp(xattr_data->digest, calc.digest,
rc = crypto_memneq(xattr_data->digest, calc.digest,
if (rc)
rc = -EINVAL;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment