Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Tue, 26 Sep 2023 12:02:53 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kalle Valo <kvalo@kernel.org>,
        Johannes Berg <johannes@sipsolutions.net>,
        Wireless <linux-wireless@vger.kernel.org>
Cc:     Johannes Berg <johannes.berg@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20230926120253.4f1e5730@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/syRt0eOJQcCbFd=QbOtETN4";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/syRt0eOJQcCbFd=QbOtETN4
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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;
  	}
 =20
 -	return ieee80211_key_link(key, link, sta);
 +	err =3D ieee80211_key_link(key, link, sta);
 +	/* KRACK protection, shouldn't happen but just silently accept key */
 +	if (err =3D=3D -EALREADY)
 +		err =3D 0;
-=20
-  out_unlock:
- 	mutex_unlock(&local->sta_mtx);
-=20
 +	return err;
  }
 =20
  static struct ieee80211_key *

--Sig_/syRt0eOJQcCbFd=QbOtETN4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUSO80ACgkQAVBC80lX
0GzQLwgAnBH0KvaJHxWsSbMIwPyNkzaDt8WO3G8EXyCNl5WgLBMq4hzk0Y7dcvJ2
KJQ2s7hh9GZXJ7KzF9hL68uhfNpWJzBZPpUVUokARPS0CceqSpvuJ9rN5RLzVoI4
TOcSgxZpKUl74VbBDzrTPHz6D75Mke4UeVMHq2ZNy7coXOUmVxBwKkvvrjG3lUW7
KfgG+XaviADGiXPPdKn5I9MVFuykqoaNK6n74sZVsbTU3yXl98vkeF2a5DLHbVmJ
IAThVHIOH8Gi52stLz4na1gyHsh5BNhalCqNqZAtQyih7W7BRwqYwFo3jr7dD1ls
ilWn+L86bQrpwEUMMdz7zejT8VnOZA==
=WjiI
-----END PGP SIGNATURE-----

--Sig_/syRt0eOJQcCbFd=QbOtETN4--