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>
This commit is contained in:
parent
f96121b6af
commit
f8e84384a6
|
@ -19,6 +19,7 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
#include <net/mac80211.h>
|
#include <net/mac80211.h>
|
||||||
|
#include <crypto/algapi.h>
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
#include "ieee80211_i.h"
|
#include "ieee80211_i.h"
|
||||||
#include "driver-ops.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.
|
* new version of the key to avoid nonce reuse or replay issues.
|
||||||
*/
|
*/
|
||||||
if (old_key && key->conf.keylen == old_key->conf.keylen &&
|
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);
|
ieee80211_key_free_unused(key);
|
||||||
ret = 0;
|
ret = 0;
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in New Issue