diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-17 20:32:07 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-18 09:39:14 +0200 |
| commit | 2bdd713b92a9cade239d3c7d15205a09f556624d (patch) | |
| tree | b441303ef59832d45fa555ee2bf3e52f7c13980c /net/mac80211/key.c | |
| parent | 1b72bf5a0777d7cec6c2d857ac15599022b3c123 (diff) | |
| download | linux-stable-2bdd713b92a9cade239d3c7d15205a09f556624d.tar.gz linux-stable-2bdd713b92a9cade239d3c7d15205a09f556624d.tar.bz2 linux-stable-2bdd713b92a9cade239d3c7d15205a09f556624d.zip | |
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>
Diffstat (limited to 'net/mac80211/key.c')
| -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 ae995c8480db..035d16fe926e 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" @@ -635,7 +636,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; |