leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath10k: fix static wep with more than 1 key in client mode

Browse Source 
The default keyidx callback may be called after
more than 1 key is installed. This led to only 1
WEP key being reinstalled only. This caused Rxed
traffic encrypted with other WEP keys to be
dropped in client mode.

Tested-by: Bartosz Markowski <bartosz.markowski@tieto.com>
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Michal Kazior 2015-04-01 22:53:20 +03:00 committed by Kalle Valo
parent 7c8cc7eb4f
commit 15677a7dbe
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/net/wireless/ath/ath10k/mac.c
View File

@ -360,39 +360,42 @@ static int ath10k_clear_vdev_key(struct ath10k_vif *arvif,
return first_errno; return first_errno;
} }
static int ath10k_mac_vif_sta_fix_wep_key(struct ath10k_vif *arvif) static int ath10k_mac_vif_sta_fix_wep_key(struct ath10k_vif *arvif, int keyidx)
{ {
struct ath10k *ar = arvif->ar; struct ath10k *ar = arvif->ar;
enum nl80211_iftype iftype = arvif->vif->type; enum nl80211_iftype iftype = arvif->vif->type;
struct ieee80211_key_conf *key; struct ieee80211_key_conf *key;
u32 flags = 0; u32 flags;
int num = 0;
int i;
int ret; int ret;
int i;
lockdep_assert_held(&ar->conf_mutex); lockdep_assert_held(&ar->conf_mutex);
if (iftype != NL80211_IFTYPE_STATION) if (iftype != NL80211_IFTYPE_STATION)
return 0; return 0;
for (i = 0; i < ARRAY_SIZE(arvif->wep_keys); i++) { if (keyidx < 0)
if (arvif->wep_keys[i]) {
key = arvif->wep_keys[i];
++num;
}
}
if (num != 1)
return 0; return 0;
flags |= WMI_KEY_PAIRWISE; for (i = 0; i < ARRAY_SIZE(arvif->wep_keys); i++) {
flags |= WMI_KEY_TX_USAGE; if (!arvif->wep_keys[i])
continue;
ret = ath10k_install_key(arvif, key, SET_KEY, arvif->bssid, flags); key = arvif->wep_keys[i];
if (ret) {
ath10k_warn(ar, "failed to install key %i on vdev %i: %d\n", flags = 0;
key->keyidx, arvif->vdev_id, ret); flags |= WMI_KEY_PAIRWISE;
return ret;
if (key->keyidx == keyidx)
flags |= WMI_KEY_TX_USAGE;
ret = ath10k_install_key(arvif, key, SET_KEY, arvif->bssid,
flags);
if (ret) {
ath10k_warn(ar, "failed to install key %i on vdev %i: %d\n",
key->keyidx, arvif->vdev_id, ret);
return ret;
}
} }
return 0; return 0;
@ -4846,7 +4849,7 @@ static void ath10k_set_default_unicast_key(struct ieee80211_hw *hw,
arvif->def_wep_key_idx = keyidx; arvif->def_wep_key_idx = keyidx;
ret = ath10k_mac_vif_sta_fix_wep_key(arvif); ret = ath10k_mac_vif_sta_fix_wep_key(arvif, keyidx);
if (ret) { if (ret) {
ath10k_warn(ar, "failed to fix sta wep key on vdev %i: %d\n", ath10k_warn(ar, "failed to fix sta wep key on vdev %i: %d\n",
arvif->vdev_id, ret); arvif->vdev_id, ret);