Commit 37510515 authored by Ryan Ware's avatar Ryan Ware Committed by Willy Tarreau

EVM: Use crypto_memneq() for digest comparisons

commit 613317bd upstream.

This patch fixes vulnerability CVE-2016-2085.  The problem exists
because the vm_verify_hmac() function includes a use of memcmp().
Unfortunately, this allows timing side channel attacks; specifically
a MAC forgery complexity drop from 2^128 to 2^12.  This patch changes
the memcmp() to the cryptographically safe crypto_memneq().
Reported-by: default avatarXiaofei Rex Guo <xiaofei.rex.guo@intel.com>
Signed-off-by: default avatarRyan Ware <ware@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 5fd53819
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/integrity.h> #include <linux/integrity.h>
#include <linux/evm.h> #include <linux/evm.h>
#include <crypto/hash.h> #include <crypto/hash.h>
#include <crypto/algapi.h>
#include "evm.h" #include "evm.h"
int evm_initialized; int evm_initialized;
...@@ -128,7 +129,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, ...@@ -128,7 +129,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
xattr_value_len, calc.digest); xattr_value_len, calc.digest);
if (rc) if (rc)
break; break;
rc = memcmp(xattr_data->digest, calc.digest, rc = crypto_memneq(xattr_data->digest, calc.digest,
sizeof(calc.digest)); sizeof(calc.digest));
if (rc) if (rc)
rc = -EINVAL; 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