delete queue-3.10/evm-use-crypto_memneq-for-digest-comparisons.patch

diff --git a/queue-3.10/evm-use-crypto_memneq-for-digest-comparisons.patch b/queue-3.10/evm-use-crypto_memneq-for-digest-comparisons.patch
deleted file mode 100644 (file)
index b563057..0000000
--- a/queue-3.10/evm-use-crypto_memneq-for-digest-comparisons.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 613317bd212c585c20796c10afe5daaa95d4b0a1 Mon Sep 17 00:00:00 2001
-From: Ryan Ware <ware@linux.intel.com>
-Date: Thu, 11 Feb 2016 15:58:44 -0800
-Subject: EVM: Use crypto_memneq() for digest comparisons
-
-From: Ryan Ware <ware@linux.intel.com>
-
-commit 613317bd212c585c20796c10afe5daaa95d4b0a1 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: Xiaofei Rex Guo <xiaofei.rex.guo@intel.com>
-Signed-off-by: Ryan Ware <ware@linux.intel.com>
-Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
-Signed-off-by: James Morris <james.l.morris@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- security/integrity/evm/evm_main.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/security/integrity/evm/evm_main.c
-+++ b/security/integrity/evm/evm_main.c
-@@ -20,6 +20,7 @@
- #include <linux/integrity.h>
- #include <linux/evm.h>
- #include <crypto/hash.h>
-+#include <crypto/algapi.h>
- #include "evm.h"
- 
- int evm_initialized;
-@@ -128,7 +129,7 @@ static enum integrity_status evm_verify_
-                                  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;

diff --git a/queue-3.10/series b/queue-3.10/series
index 1b15a7f97b1b67973f789038bd13f795b3829209..340781af90cf45344f6d1943eccbd4993536118e 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -58,7 +58,6 @@ ahci-fix-softreset-failed-issue-of-port-multiplier.patch
 libata-disable-forced-ports_impl-for-ahci-1.3.patch
 ahci-intel-dnv-device-ids-sata.patch
 crypto-algif_hash-wait-for-crypto_ahash_init-to-complete.patch
-evm-use-crypto_memneq-for-digest-comparisons.patch
 crypto-user-lock-crypto_alg_list-on-alg-dump.patch
 fs-cache-increase-reference-of-parent-after-registering-netfs-success.patch
 binfmt_elf-don-t-clobber-passed-executable-s-file-header.patch