rndis_wlan: Implement cfg80211 PMKSA API
Add support for cfg80211 set_pmksa/del_pmksa/flush_pmksa. Updating PMKID entry list is done on driver side since NDIS API requires full list update. v2: - fixed to use new netdev_dbg/warn/etc instead of old devdbg/warn/etc - fixed false padding from struct ndis_80211_bssid_info Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Jussi Kivilinna
John W. Linville
parent
0308383f95
commit
5a7d05830d
|
|
@ -372,6 +372,17 @@ struct ndis_80211_capability {
|
|||
struct ndis_80211_auth_encr_pair auth_encr_pair[0];
|
||||
} __attribute__((packed));
|
||||
|
||||
struct ndis_80211_bssid_info {
|
||||
u8 bssid[6];
|
||||
u8 pmkid[16];
|
||||
};
|
||||
|
||||
struct ndis_80211_pmkid {
|
||||
__le32 length;
|
||||
__le32 bssid_info_count;
|
||||
struct ndis_80211_bssid_info bssid_info[0];
|
||||
};
|
||||
|
||||
/*
|
||||
* private data
|
||||
*/
|
||||
|
|
@ -542,6 +553,14 @@ static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev,
|
|||
static int rndis_dump_station(struct wiphy *wiphy, struct net_device *dev,
|
||||
int idx, u8 *mac, struct station_info *sinfo);
|
||||
|
||||
static int rndis_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
|
||||
struct cfg80211_pmksa *pmksa);
|
||||
|
||||
static int rndis_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
|
||||
struct cfg80211_pmksa *pmksa);
|
||||
|
||||
static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev);
|
||||
|
||||
static struct cfg80211_ops rndis_config_ops = {
|
||||
.change_virtual_intf = rndis_change_virtual_intf,
|
||||
.scan = rndis_scan,
|
||||
|
|
@ -558,6 +577,9 @@ static struct cfg80211_ops rndis_config_ops = {
|
|||
.set_default_key = rndis_set_default_key,
|
||||
.get_station = rndis_get_station,
|
||||
.dump_station = rndis_dump_station,
|
||||
.set_pmksa = rndis_set_pmksa,
|
||||
.del_pmksa = rndis_del_pmksa,
|
||||
.flush_pmksa = rndis_flush_pmksa,
|
||||
};
|
||||
|
||||
static void *rndis_wiphy_privid = &rndis_wiphy_privid;
|
||||
|
|
@ -1580,6 +1602,194 @@ static void set_multicast_list(struct usbnet *usbdev)
|
|||
le32_to_cpu(filter), ret);
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
static void debug_print_pmkids(struct usbnet *usbdev,
|
||||
struct ndis_80211_pmkid *pmkids,
|
||||
const char *func_str)
|
||||
{
|
||||
struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
|
||||
int i, len, count, max_pmkids, entry_len;
|
||||
|
||||
max_pmkids = priv->wdev.wiphy->max_num_pmkids;
|
||||
len = le32_to_cpu(pmkids->length);
|
||||
count = le32_to_cpu(pmkids->bssid_info_count);
|
||||
|
||||
entry_len = (count > 0) ? (len - sizeof(*pmkids)) / count : -1;
|
||||
|
||||
netdev_dbg(usbdev->net, "%s(): %d PMKIDs (data len: %d, entry len: "
|
||||
"%d)\n", func_str, count, len, entry_len);
|
||||
|
||||
if (count > max_pmkids)
|
||||
count = max_pmkids;
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
u32 *tmp = (u32 *)pmkids->bssid_info[i].pmkid;
|
||||
|
||||
netdev_dbg(usbdev->net, "%s(): bssid: %pM, "
|
||||
"pmkid: %08X:%08X:%08X:%08X\n",
|
||||
func_str, pmkids->bssid_info[i].bssid,
|
||||
cpu_to_be32(tmp[0]), cpu_to_be32(tmp[1]),
|
||||
cpu_to_be32(tmp[2]), cpu_to_be32(tmp[3]));
|
||||
}
|
||||
}
|
||||
#else
|
||||
static void debug_print_pmkids(struct usbnet *usbdev,
|
||||
struct ndis_80211_pmkid *pmkids,
|
||||
const char *func_str)
|
||||
{
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct ndis_80211_pmkid *get_device_pmkids(struct usbnet *usbdev)
|
||||
{
|
||||
struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
|
||||
struct ndis_80211_pmkid *pmkids;
|
||||
int len, ret, max_pmkids;
|
||||
|
||||
max_pmkids = priv->wdev.wiphy->max_num_pmkids;
|
||||
len = sizeof(*pmkids) + max_pmkids * sizeof(pmkids->bssid_info[0]);
|
||||
|
||||
pmkids = kzalloc(len, GFP_KERNEL);
|
||||
if (!pmkids)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
pmkids->length = cpu_to_le32(len);
|
||||
pmkids->bssid_info_count = cpu_to_le32(max_pmkids);
|
||||
|
||||
ret = rndis_query_oid(usbdev, OID_802_11_PMKID, pmkids, &len);
|
||||
if (ret < 0) {
|
||||
netdev_dbg(usbdev->net, "%s(): OID_802_11_PMKID(%d, %d)"
|
||||
" -> %d\n", __func__, len, max_pmkids, ret);
|
||||
|
||||
kfree(pmkids);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
if (le32_to_cpu(pmkids->bssid_info_count) > max_pmkids)
|
||||
pmkids->bssid_info_count = cpu_to_le32(max_pmkids);
|
||||
|
||||
debug_print_pmkids(usbdev, pmkids, __func__);
|
||||
|
||||
return pmkids;
|
||||
}
|
||||
|
||||
static int set_device_pmkids(struct usbnet *usbdev,
|
||||
struct ndis_80211_pmkid *pmkids)
|
||||
{
|
||||
int ret, len, num_pmkids;
|
||||
|
||||
num_pmkids = le32_to_cpu(pmkids->bssid_info_count);
|
||||
len = sizeof(*pmkids) + num_pmkids * sizeof(pmkids->bssid_info[0]);
|
||||
pmkids->length = cpu_to_le32(len);
|
||||
|
||||
debug_print_pmkids(usbdev, pmkids, __func__);
|
||||
|
||||
ret = rndis_set_oid(usbdev, OID_802_11_PMKID, pmkids,
|
||||
le32_to_cpu(pmkids->length));
|
||||
if (ret < 0) {
|
||||
netdev_dbg(usbdev->net, "%s(): OID_802_11_PMKID(%d, %d) -> %d"
|
||||
"\n", __func__, len, num_pmkids, ret);
|
||||
}
|
||||
|
||||
kfree(pmkids);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct ndis_80211_pmkid *remove_pmkid(struct usbnet *usbdev,
|
||||
struct ndis_80211_pmkid *pmkids,
|
||||
struct cfg80211_pmksa *pmksa,
|
||||
int max_pmkids)
|
||||
{
|
||||
int i, len, count, newlen, err;
|
||||
|
||||
len = le32_to_cpu(pmkids->length);
|
||||
count = le32_to_cpu(pmkids->bssid_info_count);
|
||||
|
||||
if (count > max_pmkids)
|
||||
count = max_pmkids;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
if (!compare_ether_addr(pmkids->bssid_info[i].bssid,
|
||||
pmksa->bssid))
|
||||
break;
|
||||
|
||||
/* pmkid not found */
|
||||
if (i == count) {
|
||||
netdev_dbg(usbdev->net, "%s(): bssid not found (%pM)\n",
|
||||
__func__, pmksa->bssid);
|
||||
err = -ENOENT;
|
||||
goto error;
|
||||
}
|
||||
|
||||
for (; i + 1 < count; i++)
|
||||
pmkids->bssid_info[i] = pmkids->bssid_info[i + 1];
|
||||
|
||||
count--;
|
||||
newlen = sizeof(*pmkids) + count * sizeof(pmkids->bssid_info[0]);
|
||||
|
||||
pmkids->length = cpu_to_le32(newlen);
|
||||
pmkids->bssid_info_count = cpu_to_le32(count);
|
||||
|
||||
return pmkids;
|
||||
error:
|
||||
kfree(pmkids);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
static struct ndis_80211_pmkid *update_pmkid(struct usbnet *usbdev,
|
||||
struct ndis_80211_pmkid *pmkids,
|
||||
struct cfg80211_pmksa *pmksa,
|
||||
int max_pmkids)
|
||||
{
|
||||
int i, err, len, count, newlen;
|
||||
|
||||
len = le32_to_cpu(pmkids->length);
|
||||
count = le32_to_cpu(pmkids->bssid_info_count);
|
||||
|
||||
if (count > max_pmkids)
|
||||
count = max_pmkids;
|
||||
|
||||
/* update with new pmkid */
|
||||
for (i = 0; i < count; i++) {
|
||||
if (compare_ether_addr(pmkids->bssid_info[i].bssid,
|
||||
pmksa->bssid))
|
||||
continue;
|
||||
|
||||
memcpy(pmkids->bssid_info[i].pmkid, pmksa->pmkid,
|
||||
WLAN_PMKID_LEN);
|
||||
|
||||
return pmkids;
|
||||
}
|
||||
|
||||
/* out of space, return error */
|
||||
if (i == max_pmkids) {
|
||||
netdev_dbg(usbdev->net, "%s(): out of space\n", __func__);
|
||||
err = -ENOSPC;
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* add new pmkid */
|
||||
newlen = sizeof(*pmkids) + (count + 1) * sizeof(pmkids->bssid_info[0]);
|
||||
|
||||
pmkids = krealloc(pmkids, newlen, GFP_KERNEL);
|
||||
if (!pmkids) {
|
||||
err = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
|
||||
pmkids->length = cpu_to_le32(newlen);
|
||||
pmkids->bssid_info_count = cpu_to_le32(count + 1);
|
||||
|
||||
memcpy(pmkids->bssid_info[count].bssid, pmksa->bssid, ETH_ALEN);
|
||||
memcpy(pmkids->bssid_info[count].pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
|
||||
|
||||
return pmkids;
|
||||
error:
|
||||
kfree(pmkids);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
/*
|
||||
* cfg80211 ops
|
||||
*/
|
||||
|
|
@ -2190,6 +2400,78 @@ static int rndis_dump_station(struct wiphy *wiphy, struct net_device *dev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rndis_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
|
||||
struct cfg80211_pmksa *pmksa)
|
||||
{
|
||||
struct rndis_wlan_private *priv = wiphy_priv(wiphy);
|
||||
struct usbnet *usbdev = priv->usbdev;
|
||||
struct ndis_80211_pmkid *pmkids;
|
||||
u32 *tmp = (u32 *)pmksa->pmkid;
|
||||
|
||||
netdev_dbg(usbdev->net, "%s(%pM, %08X:%08X:%08X:%08X)\n", __func__,
|
||||
pmksa->bssid,
|
||||
cpu_to_be32(tmp[0]), cpu_to_be32(tmp[1]),
|
||||
cpu_to_be32(tmp[2]), cpu_to_be32(tmp[3]));
|
||||
|
||||
pmkids = get_device_pmkids(usbdev);
|
||||
if (IS_ERR(pmkids)) {
|
||||
/* couldn't read PMKID cache from device */
|
||||
return PTR_ERR(pmkids);
|
||||
}
|
||||
|
||||
pmkids = update_pmkid(usbdev, pmkids, pmksa, wiphy->max_num_pmkids);
|
||||
if (IS_ERR(pmkids)) {
|
||||
/* not found, list full, etc */
|
||||
return PTR_ERR(pmkids);
|
||||
}
|
||||
|
||||
return set_device_pmkids(usbdev, pmkids);
|
||||
}
|
||||
|
||||
static int rndis_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
|
||||
struct cfg80211_pmksa *pmksa)
|
||||
{
|
||||
struct rndis_wlan_private *priv = wiphy_priv(wiphy);
|
||||
struct usbnet *usbdev = priv->usbdev;
|
||||
struct ndis_80211_pmkid *pmkids;
|
||||
u32 *tmp = (u32 *)pmksa->pmkid;
|
||||
|
||||
netdev_dbg(usbdev->net, "%s(%pM, %08X:%08X:%08X:%08X)\n", __func__,
|
||||
pmksa->bssid,
|
||||
cpu_to_be32(tmp[0]), cpu_to_be32(tmp[1]),
|
||||
cpu_to_be32(tmp[2]), cpu_to_be32(tmp[3]));
|
||||
|
||||
pmkids = get_device_pmkids(usbdev);
|
||||
if (IS_ERR(pmkids)) {
|
||||
/* Couldn't read PMKID cache from device */
|
||||
return PTR_ERR(pmkids);
|
||||
}
|
||||
|
||||
pmkids = remove_pmkid(usbdev, pmkids, pmksa, wiphy->max_num_pmkids);
|
||||
if (IS_ERR(pmkids)) {
|
||||
/* not found, etc */
|
||||
return PTR_ERR(pmkids);
|
||||
}
|
||||
|
||||
return set_device_pmkids(usbdev, pmkids);
|
||||
}
|
||||
|
||||
static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
|
||||
{
|
||||
struct rndis_wlan_private *priv = wiphy_priv(wiphy);
|
||||
struct usbnet *usbdev = priv->usbdev;
|
||||
struct ndis_80211_pmkid pmkid;
|
||||
|
||||
netdev_dbg(usbdev->net, "%s()\n", __func__);
|
||||
|
||||
memset(&pmkid, 0, sizeof(pmkid));
|
||||
|
||||
pmkid.length = cpu_to_le32(sizeof(pmkid));
|
||||
pmkid.bssid_info_count = cpu_to_le32(0);
|
||||
|
||||
return rndis_set_oid(usbdev, OID_802_11_PMKID, &pmkid, sizeof(pmkid));
|
||||
}
|
||||
|
||||
/*
|
||||
* workers, indication handlers, device poller
|
||||
*/
|
||||
|
|
|
|||
Reference in New Issue