drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
The wcid can be NULL. It should be checked for validity before
dereferencing it to avoid crash.
Fixes: 098428c400ff ("wifi: mt76: connac: set correct muar_idx for mt799x chipsets")
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index af0c2b2aacb00..7af60eebe517a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -283,7 +283,7 @@ __mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,
};
struct sk_buff *skb;
- if (is_mt799x(dev) && !wcid->sta)
+ if (is_mt799x(dev) && wcid && !wcid->sta)
hdr.muar_idx = 0xe;
mt76_connac_mcu_get_wlan_idx(dev, wcid, &hdr.wlan_idx_lo,
--
2.39.2
Soft reminder On 3/1/24 7:44 PM, Muhammad Usama Anjum wrote: > The wcid can be NULL. It should be checked for validity before > dereferencing it to avoid crash. > > Fixes: 098428c400ff ("wifi: mt76: connac: set correct muar_idx for mt799x chipsets") > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> > --- > drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > index af0c2b2aacb00..7af60eebe517a 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > @@ -283,7 +283,7 @@ __mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif, > }; > struct sk_buff *skb; > > - if (is_mt799x(dev) && !wcid->sta) > + if (is_mt799x(dev) && wcid && !wcid->sta) > hdr.muar_idx = 0xe; > > mt76_connac_mcu_get_wlan_idx(dev, wcid, &hdr.wlan_idx_lo, -- BR, Muhammad Usama Anjum
Soft reminder On 3/11/24 10:11 PM, Muhammad Usama Anjum wrote: > Soft reminder > > On 3/1/24 7:44 PM, Muhammad Usama Anjum wrote: >> The wcid can be NULL. It should be checked for validity before >> dereferencing it to avoid crash. >> >> Fixes: 098428c400ff ("wifi: mt76: connac: set correct muar_idx for mt799x chipsets") >> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> >> --- >> drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c >> index af0c2b2aacb00..7af60eebe517a 100644 >> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c >> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c >> @@ -283,7 +283,7 @@ __mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif, >> }; >> struct sk_buff *skb; >> >> - if (is_mt799x(dev) && !wcid->sta) >> + if (is_mt799x(dev) && wcid && !wcid->sta) >> hdr.muar_idx = 0xe; >> >> mt76_connac_mcu_get_wlan_idx(dev, wcid, &hdr.wlan_idx_lo, > -- BR, Muhammad Usama Anjum
On 04.04.24 13:49, Muhammad Usama Anjum wrote: > Soft reminder I have this one in my mt76 tree already, and it will be included in my next pull request to Kalle. - Felix
Il 01/03/24 15:44, Muhammad Usama Anjum ha scritto: > The wcid can be NULL. It should be checked for validity before > dereferencing it to avoid crash. > > Fixes: 098428c400ff ("wifi: mt76: connac: set correct muar_idx for mt799x chipsets") > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
© 2016 - 2024 Red Hat, Inc.