aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-11-05 22:13:16 +0100
committerFelix Fietkau <nbd@nbd.name>2017-11-16 15:23:35 +0100
commitf9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0 (patch)
tree677b801ef85f44c54cea9c9b580fd38d139511aa /package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch
parenta8d751c243b9d840b97293b289adddb0df438358 (diff)
downloadupstream-f9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0.tar.gz
upstream-f9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0.tar.bz2
upstream-f9fa266faf9a2fdea48cc2fb72fa5a7e52a527c0.zip
mac80211: update to wireless-testing 2017-11-01
The wireless regdb is now loaded via firmware loading, CRDA support and built-in regdb support have been removed. Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch')
-rw-r--r--package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch b/package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch
deleted file mode 100644
index 03e8201902..0000000000
--- a/package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2bdd713b92a9cade239d3c7d15205a09f556624d Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Tue, 17 Oct 2017 20:32:07 +0200
-Subject: [PATCH] mac80211: use constant time comparison with keys
-
-Otherwise we risk leaking information via timing side channel.
-
-Fixes: fdf7cb4185b6 ("mac80211: accept key reinstall without changing anything")
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
----
- net/mac80211/key.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/key.c
-+++ b/net/mac80211/key.c
-@@ -19,6 +19,7 @@
- #include <linux/slab.h>
- #include <linux/export.h>
- #include <net/mac80211.h>
-+#include <crypto/algapi.h>
- #include <asm/unaligned.h>
- #include "ieee80211_i.h"
- #include "driver-ops.h"
-@@ -635,7 +636,7 @@ int ieee80211_key_link(struct ieee80211_
- * new version of the key to avoid nonce reuse or replay issues.
- */
- if (old_key && key->conf.keylen == old_key->conf.keylen &&
-- !memcmp(key->conf.key, old_key->conf.key, key->conf.keylen)) {
-+ !crypto_memneq(key->conf.key, old_key->conf.key, key->conf.keylen)) {
- ieee80211_key_free_unused(key);
- ret = 0;
- goto out;