Received-SPF: pass (google.com: domain of linux-wireless+bounces-5067-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 21 Mar 2024 00:03:15 +0100
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: greearb@candelatech.com
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] wifi: mt76: mt7925:  Fix invalid chandef access.
Message-ID: <ZftrMyXvN7JcWhHH@lore-desk>
References: <20240320192723.3440938-1-greearb@candelatech.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="mbHqCuuY8mc3q/sM"
Content-Disposition: inline
In-Reply-To: <20240320192723.3440938-1-greearb@candelatech.com>


--mbHqCuuY8mc3q/sM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

> From: Ben Greear <greearb@candelatech.com>
>=20
> mt76.ctx can be null, and that causes chandef to be null.
> Use logic found in similar code paths to use chandef
> from the phy object in case ctx is NULL.
>=20
> With this, my system no longer crashes, but STA will still not
> associate.

Hi Ben,

can you please add 'Fixes' tag to help people backporting the fix?
I think it is:
Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt=
7925 chips")

Regards,
Lorenzo

>=20
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
>  drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/ne=
t/wireless/mediatek/mt76/mt7925/mcu.c
> index bd37cb8d734b..feb818411a25 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> @@ -1502,7 +1502,8 @@ mt7925_mcu_sta_phy_tlv(struct sk_buff *skb,
>  		       struct ieee80211_vif *vif, struct ieee80211_sta *sta)
>  {
>  	struct mt792x_vif *mvif =3D (struct mt792x_vif *)vif->drv_priv;
> -	struct cfg80211_chan_def *chandef =3D &mvif->mt76.ctx->def;
> +	struct mt76_phy *mphy =3D mvif->phy->mt76;
> +	struct cfg80211_chan_def *chandef =3D mvif->mt76.ctx ? &mvif->mt76.ctx-=
>def : &mphy->chandef;
>  	struct sta_rec_phy *phy;
>  	struct tlv *tlv;
>  	u8 af =3D 0, mm =3D 0;
> @@ -1569,7 +1570,8 @@ mt7925_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb,
>  			     struct ieee80211_vif *vif, struct ieee80211_sta *sta)
>  {
>  	struct mt792x_vif *mvif =3D (struct mt792x_vif *)vif->drv_priv;
> -	struct cfg80211_chan_def *chandef =3D &mvif->mt76.ctx->def;
> +	struct mt76_phy *mphy =3D mvif->phy->mt76;
> +	struct cfg80211_chan_def *chandef =3D mvif->mt76.ctx ? &mvif->mt76.ctx-=
>def : &mphy->chandef;
>  	enum nl80211_band band =3D chandef->chan->band;
>  	struct sta_rec_ra_info *ra_info;
>  	struct tlv *tlv;
> --=20
> 2.42.0
>=20
>=20

--mbHqCuuY8mc3q/sM
Content-Type: application/pgp-signature; name="signature.asc"

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

iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCZftrMgAKCRA6cBh0uS2t
rLiDAQDoZpbIV/FIHpGoUexm+PmkWYdLVchp3HVD0SqS1wa7XQEAl6ykqMhQLh5F
qsRKbGp02RozE05CV2pNK9iJ8O2x9w4=
=zzTF
-----END PGP SIGNATURE-----

--mbHqCuuY8mc3q/sM--