Hi all,
Today's linux-next merge of the wireless-next tree got conflicts in:
net/mac80211/cfg.c
between commit:
31db78a4923e ("wifi: mac80211: fix potential key use-after-free")
from the wireless tree and commit:
4d3acf4311a0 ("wifi: mac80211: remove sta_mtx")
from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/mac80211/cfg.c
index 0e3a1753a51c,5bc6b1329465..000000000000
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -565,15 -561,7 +561,11 @@@ static int ieee80211_add_key(struct wip
break;
}
- return ieee80211_key_link(key, link, sta);
+ err = ieee80211_key_link(key, link, sta);
+ /* KRACK protection, shouldn't happen but just silently accept key */
+ if (err == -EALREADY)
+ err = 0;
-
- out_unlock:
- mutex_unlock(&local->sta_mtx);
-
+ return err;
}
static struct ieee80211_key *
Attachment:
pgpSLELMx9MIV.pgp
Description: OpenPGP digital signature
