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.
Date: Thu, 21 Mar 2024 00:03:15 +0100 [thread overview]
Message-ID: <ZftrMyXvN7JcWhHH@lore-desk> (raw)
In-Reply-To: <20240320192723.3440938-1-greearb@candelatech.com>
[-- Attachment #1: Type: text/plain, Size: 2007 bytes --]
> From: Ben Greear <greearb@candelatech.com>
>
> 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.
>
> 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 mt7925 chips")
Regards,
Lorenzo
>
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
> drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/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 = (struct mt792x_vif *)vif->drv_priv;
> - struct cfg80211_chan_def *chandef = &mvif->mt76.ctx->def;
> + struct mt76_phy *mphy = mvif->phy->mt76;
> + struct cfg80211_chan_def *chandef = mvif->mt76.ctx ? &mvif->mt76.ctx->def : &mphy->chandef;
> struct sta_rec_phy *phy;
> struct tlv *tlv;
> u8 af = 0, mm = 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 = (struct mt792x_vif *)vif->drv_priv;
> - struct cfg80211_chan_def *chandef = &mvif->mt76.ctx->def;
> + struct mt76_phy *mphy = mvif->phy->mt76;
> + struct cfg80211_chan_def *chandef = mvif->mt76.ctx ? &mvif->mt76.ctx->def : &mphy->chandef;
> enum nl80211_band band = chandef->chan->band;
> struct sta_rec_ra_info *ra_info;
> struct tlv *tlv;
> --
> 2.42.0
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2024-03-20 23:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 19:27 [PATCH] wifi: mt76: mt7925: Fix invalid chandef access greearb
2024-03-20 23:03 ` Lorenzo Bianconi [this message]
2024-03-27 16:49 ` Ben Greear
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZftrMyXvN7JcWhHH@lore-desk \
--to=lorenzo@kernel.org \
--cc=greearb@candelatech.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).