Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32025b5c authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

mac80211: use constant time comparison with keys 



commit 2bdd713b92a9cade239d3c7d15205a09f556624d upstream.

Otherwise we risk leaking information via timing side channel.

Fixes: fdf7cb4185b6 ("mac80211: accept key reinstall without changing anything")
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6891c6fd

net/mac80211/key.c

+2 −1
Original line number Diff line number Diff line
@@ -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"
@@ -501,7 +502,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;