Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Date:   Tue, 26 Sep 2023 12:20:09 +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: <20230926122009.67735060@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KDVFAo=cdHDYBMd1yQd=GhK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/KDVFAo=cdHDYBMd1yQd=GhK
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 a conflict in:

  net/mac80211/key.c

between commits:

  31db78a4923e ("wifi: mac80211: fix potential key use-after-free")
  d097ae01ebd4 ("wifi: mac80211: fix potential key leak")

from the wireless tree and commit:

  2a8b665e6bcc ("wifi: mac80211: remove key_mtx")

from the wireless-next tree.

I fixed it up (I think - 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/key.c
index 0665ff5e456e,ac410f6632b5..000000000000
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@@ -881,21 -875,20 +880,22 @@@ int ieee80211_key_link(struct ieee80211
 =20
  		if (link_id >=3D 0) {
  			link_sta =3D rcu_dereference_protected(sta->link[link_id],
- 							     lockdep_is_held(&sta->local->sta_mtx));
+ 							     lockdep_is_held(&sta->local->hw.wiphy->mtx));
 -			if (!link_sta)
 -				return -ENOLINK;
 +			if (!link_sta) {
 +				ret =3D -ENOLINK;
 +				goto out;
 +			}
  		}
 =20
- 		old_key =3D key_mtx_dereference(sdata->local, link_sta->gtk[idx]);
+ 		old_key =3D wiphy_dereference(sdata->local->hw.wiphy,
+ 					    link_sta->gtk[idx]);
  	} else {
  		if (idx < NUM_DEFAULT_KEYS)
- 			old_key =3D key_mtx_dereference(sdata->local,
- 						      sdata->keys[idx]);
+ 			old_key =3D wiphy_dereference(sdata->local->hw.wiphy,
+ 						    sdata->keys[idx]);
  		if (!old_key)
- 			old_key =3D key_mtx_dereference(sdata->local,
- 						      link->gtk[idx]);
+ 			old_key =3D wiphy_dereference(sdata->local->hw.wiphy,
+ 						    link->gtk[idx]);
  	}
 =20
  	/* Non-pairwise keys must also not switch the cipher on rekey */
@@@ -910,10 -901,10 +910,8 @@@
  	 * Silently accept key re-installation without really installing the
  	 * new version of the key to avoid nonce reuse or replay issues.
  	 */
--	if (ieee80211_key_identical(sdata, old_key, key)) {
- 		ret =3D -EALREADY;
- 		goto unlock;
 -		ieee80211_key_free_unused(key);
 -		return 0;
--	}
++	if (ieee80211_key_identical(sdata, old_key, key))
++		return -EALREADY;
 =20
  	key->local =3D sdata->local;
  	key->sdata =3D sdata;
@@@ -936,13 -927,6 +934,10 @@@
  		ieee80211_key_free(key, delay_tailroom);
  	}
 =20
 +	key =3D NULL;
 +
 + out:
 +	ieee80211_key_free_unused(key);
-  unlock:
- 	mutex_unlock(&sdata->local->key_mtx);
-=20
  	return ret;
  }
 =20

--Sig_/KDVFAo=cdHDYBMd1yQd=GhK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUSP9kACgkQAVBC80lX
0GxOwwf/bGjeKYnuKz2e6EzFgvC6zVZFPet+UiRM7RA8Y7l73Bu+N5l+34eCMcJh
fj9LCqslTg/5o/BIoe9boDMsZadr4UCNVUpa5i5kF4Cz5zM2m4Pyy+z0eq7sKHp8
gGdfXbsm+S2E2leqTK7JPU1H/GlWVhejhrw4xtJFzjMIZJuA0CnYNNZF/Z4Bai/w
JQnF57Dlgh/XNlXmCvo8zPJyBQZmPXy1QObGOCFVcAkeKz/I619241jyHbU7zap2
+M06DOAf6JRUeJMog5w3mL+/WAHOJSNddFAvYQtzYQqq68LUEXCqG17jsQT7c8LC
L3+JSUtMP5zoyQKIG3IBwyeSzJ5HFQ==
=gRb+
-----END PGP SIGNATURE-----

--Sig_/KDVFAo=cdHDYBMd1yQd=GhK--