9f1a23cbef
commit 0b59f10b1d8fe8d50944f21f5d403df9303095a8 upstream.
The problem is that the group key was saved as VNT_KEY_DEFAULTKEY
was over written by the VNT_KEY_GROUP_ADDRESS index.
mac80211 could not clear the mac_addr in the default key.
The VNT_KEY_DEFAULTKEY is not necesscary so remove it and set as
VNT_KEY_GROUP_ADDRESS.
mac80211 can clear any key using vnt_mac_disable_keyentry.
Fixes: f9ef05ce13
("staging: vt6656: Fix pairwise key for non station modes")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/da2f7e7f-1658-1320-6eee-0f55770ca391@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
159 lines
3.3 KiB
C
159 lines
3.3 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* File: key.c
|
|
*
|
|
* Purpose: Implement functions for 802.11i Key management
|
|
*
|
|
* Author: Jerry Chen
|
|
*
|
|
* Date: May 29, 2003
|
|
*
|
|
* Functions:
|
|
*
|
|
* Revision History:
|
|
*
|
|
*/
|
|
|
|
#include "mac.h"
|
|
#include "key.h"
|
|
#include "usbpipe.h"
|
|
|
|
int vnt_key_init_table(struct vnt_private *priv)
|
|
{
|
|
u8 i;
|
|
u8 data[MAX_KEY_TABLE];
|
|
|
|
for (i = 0; i < MAX_KEY_TABLE; i++)
|
|
data[i] = i;
|
|
|
|
return vnt_control_out(priv, MESSAGE_TYPE_CLRKEYENTRY,
|
|
0, 0, ARRAY_SIZE(data), data);
|
|
}
|
|
|
|
static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
|
|
struct ieee80211_key_conf *key, u32 key_type,
|
|
u32 mode, bool onfly_latch)
|
|
{
|
|
struct vnt_private *priv = hw->priv;
|
|
u8 broadcast[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
|
u16 key_mode = 0;
|
|
u32 entry = 0;
|
|
u8 *bssid;
|
|
u8 key_inx = key->keyidx;
|
|
u8 i;
|
|
|
|
if (mac_addr)
|
|
bssid = mac_addr;
|
|
else
|
|
bssid = &broadcast[0];
|
|
|
|
if (key_type != VNT_KEY_DEFAULTKEY) {
|
|
for (i = 0; i < (MAX_KEY_TABLE - 1); i++) {
|
|
if (!test_bit(i, &priv->key_entry_inuse)) {
|
|
set_bit(i, &priv->key_entry_inuse);
|
|
|
|
key->hw_key_idx = i;
|
|
entry = key->hw_key_idx;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
switch (key_type) {
|
|
case VNT_KEY_DEFAULTKEY:
|
|
/* default key last entry */
|
|
entry = MAX_KEY_TABLE - 1;
|
|
key->hw_key_idx = entry;
|
|
/* fall through */
|
|
case VNT_KEY_ALLGROUP:
|
|
key_mode |= VNT_KEY_ALLGROUP;
|
|
if (onfly_latch)
|
|
key_mode |= VNT_KEY_ONFLY_ALL;
|
|
/* fall through */
|
|
case VNT_KEY_GROUP_ADDRESS:
|
|
key_mode |= mode;
|
|
/* fall through */
|
|
case VNT_KEY_GROUP:
|
|
key_mode |= (mode << 4);
|
|
key_mode |= VNT_KEY_GROUP;
|
|
break;
|
|
case VNT_KEY_PAIRWISE:
|
|
key_mode |= mode;
|
|
key_inx = 4;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (onfly_latch)
|
|
key_mode |= VNT_KEY_ONFLY;
|
|
|
|
if (mode == KEY_CTL_WEP) {
|
|
if (key->keylen == WLAN_KEY_LEN_WEP40)
|
|
key->key[15] &= 0x7f;
|
|
if (key->keylen == WLAN_KEY_LEN_WEP104)
|
|
key->key[15] |= 0x80;
|
|
}
|
|
|
|
vnt_mac_set_keyentry(priv, key_mode, entry, key_inx, bssid, key->key);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
|
|
struct ieee80211_vif *vif, struct ieee80211_key_conf *key)
|
|
{
|
|
struct vnt_private *priv = hw->priv;
|
|
u8 *mac_addr = NULL;
|
|
u8 key_dec_mode = 0;
|
|
int ret = 0, u;
|
|
|
|
if (sta)
|
|
mac_addr = &sta->addr[0];
|
|
|
|
switch (key->cipher) {
|
|
case 0:
|
|
for (u = 0 ; u < MAX_KEY_TABLE; u++)
|
|
vnt_mac_disable_keyentry(priv, u);
|
|
return ret;
|
|
|
|
case WLAN_CIPHER_SUITE_WEP40:
|
|
case WLAN_CIPHER_SUITE_WEP104:
|
|
for (u = 0; u < MAX_KEY_TABLE; u++)
|
|
vnt_mac_disable_keyentry(priv, u);
|
|
|
|
vnt_set_keymode(hw, mac_addr, key, VNT_KEY_DEFAULTKEY,
|
|
KEY_CTL_WEP, true);
|
|
|
|
key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
|
|
|
|
return ret;
|
|
case WLAN_CIPHER_SUITE_TKIP:
|
|
key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
|
|
key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
|
|
|
|
key_dec_mode = KEY_CTL_TKIP;
|
|
|
|
break;
|
|
case WLAN_CIPHER_SUITE_CCMP:
|
|
if (priv->local_id <= MAC_REVISION_A1)
|
|
return -EINVAL;
|
|
|
|
key_dec_mode = KEY_CTL_CCMP;
|
|
|
|
key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
|
|
}
|
|
|
|
if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
|
|
vnt_set_keymode(hw, mac_addr, key, VNT_KEY_PAIRWISE,
|
|
key_dec_mode, true);
|
|
else
|
|
vnt_set_keymode(hw, mac_addr, key, VNT_KEY_GROUP_ADDRESS,
|
|
key_dec_mode, true);
|
|
|
|
return 0;
|
|
}
|