Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Date:   Tue, 26 Sep 2023 12:41:11 +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: Re: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20230926124111.29103070@canb.auug.org.au>
In-Reply-To: <20230926120253.4f1e5730@canb.auug.org.au>
References: <20230926120253.4f1e5730@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ZKHl_fTBWpCZtF5YDNHFwqc";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Tue, 26 Sep 2023 12:02:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the wireless-next tree got conflicts in:
>=20
>   net/mac80211/cfg.c
>=20
> between commit:
>=20
>   31db78a4923e ("wifi: mac80211: fix potential key use-after-free")
>=20
> from the wireless tree and commit:
>=20
>   4d3acf4311a0 ("wifi: mac80211: remove sta_mtx")
>=20
> from the wireless-next tree.
>=20
> 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.

That wasn't quite right.  The final resolution is below.
--=20
Cheers,
Stephen Rothwell

diff --cc net/mac80211/cfg.c
index 0e3a1753a51c,5bc6b1329465..3e7bb883137c
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -472,8 -470,9 +470,10 @@@ static int ieee80211_add_key(struct wip
  	struct ieee80211_local *local =3D sdata->local;
  	struct sta_info *sta =3D NULL;
  	struct ieee80211_key *key;
 +	int err;
 =20
+ 	lockdep_assert_wiphy(local->hw.wiphy);
+=20
  	if (!ieee80211_sdata_running(sdata))
  		return -ENETDOWN;
 =20
@@@ -565,15 -561,7 +562,11 @@@
  		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_/ZKHl_fTBWpCZtF5YDNHFwqc
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUSRMcACgkQAVBC80lX
0GwEggf/TpfEL0JAdGjvNEPw9ytkOvN59ikvJc+qHM/Z1gVYUr+DRYqCq5xew2de
JhVLx+++FPoX8mg5rtEfwBLVst6E7BaWWTTE7dXHXT0ZYihTfc7efZ9kzs9zWuco
I54+9WUG0l7qdbmAhQAO50qDyKpy0FD2ONLNbbB1DbiFZJoJWtvyQ4jEO8yK2V1I
EruqpiwoAip+sjMIG73NrZkD5kcD4NkpoFVRojYrhnZzMwV8u9vYfumHm37SsHCT
Y8AzrrHCwMRIgSwg6GoPUYHo2QVERQtqlwiXZeIhogp6YiyKoPvCCe4CBFiF6Mzk
/cSwnFj3FrE+pLSAzxlsLqIlvjA2ZA==
=uduE
-----END PGP SIGNATURE-----

--Sig_/ZKHl_fTBWpCZtF5YDNHFwqc--