diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-17 20:32:07 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-10-20 17:42:47 +0200 |
| commit | feca03a5c80b703b592fb92774e540314e2eb3c0 (patch) | |
| tree | e6a9cf02e9c47c2b3507e529315714dd74e893d1 /net | |
| parent | bb5e9f999e9c7025ab4fe1156dbfbdff3af466f3 (diff) | |
mac80211: use constant time comparison with keys
Otherwise we risk leaking information via timing side channel.
Change-Id: I777afd16f7b0ca8a5ab1b95ddc66689afdc96636
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>
Signed-off-by: Moyster <oysterized@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/key.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 5e647a8cb..4e18f9916 100644 --- 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" @@ -481,7 +482,7 @@ int ieee80211_key_link(struct ieee80211_key *key, * 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; |