raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

wifi: mt76: fix potential memory leak of beacon commands

Browse Source 
Fix potential memory leak when setting beacon and inband discovery
commands.

Fixes: e57b790146 ("mt76: add mac80211 driver for MT7915 PCIe-based chipsets")
Fixes: 98686cd216 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Bo Jiao
2023-08-31 14:22:16 +08:00
committed by Felix Fietkau
parent aad094be9f
commit d6a2f91741
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
View File

@@ -1927,8 +1927,10 @@ mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,
skb = ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif); skb = ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif);
} }
if (!skb) if (!skb) {
dev_kfree_skb(rskb);
return -EINVAL; return -EINVAL;
}
info = IEEE80211_SKB_CB(skb); info = IEEE80211_SKB_CB(skb);
info->control.vif = vif; info->control.vif = vif;
@@ -1940,6 +1942,7 @@ mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,
if (skb->len > MT7915_MAX_BEACON_SIZE) { if (skb->len > MT7915_MAX_BEACON_SIZE) {
dev_err(dev->mt76.dev, "inband discovery size limit exceed\n"); dev_err(dev->mt76.dev, "inband discovery size limit exceed\n");
dev_kfree_skb(rskb);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return -EINVAL; return -EINVAL;
} }
@@ -1996,11 +1999,14 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
goto out; goto out;
skb = ieee80211_beacon_get_template(hw, vif, &offs, 0); skb = ieee80211_beacon_get_template(hw, vif, &offs, 0);
if (!skb) if (!skb) {
dev_kfree_skb(rskb);
return -EINVAL; return -EINVAL;
}
if (skb->len > MT7915_MAX_BEACON_SIZE) { if (skb->len > MT7915_MAX_BEACON_SIZE) {
dev_err(dev->mt76.dev, "Bcn size limit exceed\n"); dev_err(dev->mt76.dev, "Bcn size limit exceed\n");
dev_kfree_skb(rskb);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return -EINVAL; return -EINVAL;
} }

10
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
View File

@@ -2252,11 +2252,14 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,
return PTR_ERR(rskb); return PTR_ERR(rskb);
skb = ieee80211_beacon_get_template(hw, vif, &offs, 0); skb = ieee80211_beacon_get_template(hw, vif, &offs, 0);
if (!skb) if (!skb) {
dev_kfree_skb(rskb);
return -EINVAL; return -EINVAL;
}
if (skb->len > MT7996_MAX_BEACON_SIZE) { if (skb->len > MT7996_MAX_BEACON_SIZE) {
dev_err(dev->mt76.dev, "Bcn size limit exceed\n"); dev_err(dev->mt76.dev, "Bcn size limit exceed\n");
dev_kfree_skb(rskb);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return -EINVAL; return -EINVAL;
} }
@@ -2316,11 +2319,14 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,
skb = ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif); skb = ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif);
} }
if (!skb) if (!skb) {
dev_kfree_skb(rskb);
return -EINVAL; return -EINVAL;
}
if (skb->len > MT7996_MAX_BEACON_SIZE) { if (skb->len > MT7996_MAX_BEACON_SIZE) {
dev_err(dev->mt76.dev, "inband discovery size limit exceed\n"); dev_err(dev->mt76.dev, "inband discovery size limit exceed\n");
dev_kfree_skb(rskb);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return -EINVAL; return -EINVAL;
} }