| Message ID | d560f1a16c9024b6e4029bd0baf53384f4552f5a.1683020788.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [wireless-next] wifi: mt76: mt76x02: remove WEP support | expand |
Lorenzo Bianconi <lorenzo@kernel.org> writes: > Get rid of WEP support in mt76x02_set_key routine since it is not longer > supported upstream. > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> You marked this for wireless-next so should I take this directly? Does this fix something or is just cleanup? It would be good to mention that in the commit log.
> On 3. May 2023, at 08:06, Kalle Valo <kvalo@kernel.org> wrote: > > Lorenzo Bianconi <lorenzo@kernel.org> writes: > >> Get rid of WEP support in mt76x02_set_key routine since it is not longer >> supported upstream. >> >> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > > You marked this for wireless-next so should I take this directly? > > Does this fix something or is just cleanup? It would be good to mention > that in the commit log. Not a fix, just cleanup. I will take this for the next cycle. - Felix
> Lorenzo Bianconi <lorenzo@kernel.org> writes: > > > Get rid of WEP support in mt76x02_set_key routine since it is not longer > > supported upstream. > > > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > > You marked this for wireless-next so should I take this directly? it is not a fix, "wireless-next" is just the default subjectprefix for my git tree, sorry for the confusion. I think it can go through Felix's tree. Regards, Lorenzo > > Does this fix something or is just cleanup? It would be good to mention > that in the commit log. > > -- > https://patchwork.kernel.org/project/linux-wireless/list/ > > https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Lorenzo Bianconi <lorenzo@kernel.org> writes: >> Lorenzo Bianconi <lorenzo@kernel.org> writes: >> >> > Get rid of WEP support in mt76x02_set_key routine since it is not longer >> > supported upstream. >> > >> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> >> >> You marked this for wireless-next so should I take this directly? > > it is not a fix, "wireless-next" is just the default subjectprefix for my > git tree, sorry for the confusion. I think it can go through Felix's tree. Good, thanks for for the confirmation.
Lorenzo Bianconi <lorenzo@kernel.org> writes: >@@ -471,16 +468,6 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, > } > mt76_wcid_key_setup(&dev->mt76, wcid, key); > >- if (!msta) { >- if (key || wcid->hw_key_idx == idx) { >- ret = mt76x02_mac_wcid_set_key(dev, wcid->idx, key); >- if (ret) >- return ret; >- } >- >- return mt76x02_mac_shared_key_setup(dev, mvif->idx, idx, key); >- } >- > return mt76x02_mac_wcid_set_key(dev, msta->wcid.idx, key); > } > EXPORT_SYMBOL_GPL(mt76x02_set_key); `msta` may be a null pointer. This patch may cause data to be written to a null pointer in `return mt76x02_mac_wcid_set_key(dev, msta->wcid.idx, key);`.
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c index dcbb5c605dfe..a9b770831844 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c @@ -413,12 +413,9 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct mt76x02_sta *msta; struct mt76_wcid *wcid; int idx = key->keyidx; - int ret; /* fall back to sw encryption for unsupported ciphers */ switch (key->cipher) { - case WLAN_CIPHER_SUITE_WEP40: - case WLAN_CIPHER_SUITE_WEP104: case WLAN_CIPHER_SUITE_TKIP: case WLAN_CIPHER_SUITE_CCMP: break; @@ -471,16 +468,6 @@ int mt76x02_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, } mt76_wcid_key_setup(&dev->mt76, wcid, key); - if (!msta) { - if (key || wcid->hw_key_idx == idx) { - ret = mt76x02_mac_wcid_set_key(dev, wcid->idx, key); - if (ret) - return ret; - } - - return mt76x02_mac_shared_key_setup(dev, mvif->idx, idx, key); - } - return mt76x02_mac_wcid_set_key(dev, msta->wcid.idx, key); } EXPORT_SYMBOL_GPL(mt76x02_set_key);
Get rid of WEP support in mt76x02_set_key routine since it is not longer supported upstream. Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 13 ------------- 1 file changed, 13 deletions(-)