Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull crypto fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  EVM: Use crypto_memneq() for digest comparisons
parents 27c9d772 613317bd

security/integrity/evm/evm_main.c

+2 −1
Original line number Diff line number Diff line
@@ -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;