2009-07-01 13:26:54 -06:00
|
|
|
/*
|
|
|
|
* SME code for cfg80211's connect emulation.
|
|
|
|
*
|
|
|
|
* Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
|
|
|
|
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/if_arp.h>
|
|
|
|
#include <linux/workqueue.h>
|
2009-07-27 04:01:53 -06:00
|
|
|
#include <linux/wireless.h>
|
|
|
|
#include <net/iw_handler.h>
|
2009-07-01 13:26:54 -06:00
|
|
|
#include <net/cfg80211.h>
|
|
|
|
#include <net/rtnetlink.h>
|
|
|
|
#include "nl80211.h"
|
2009-07-30 18:38:09 -06:00
|
|
|
#include "reg.h"
|
2009-07-01 13:26:54 -06:00
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
struct cfg80211_conn {
|
|
|
|
struct cfg80211_connect_params params;
|
|
|
|
/* these are sub-states of the _CONNECTING sme_state */
|
|
|
|
enum {
|
|
|
|
CFG80211_CONN_IDLE,
|
|
|
|
CFG80211_CONN_SCANNING,
|
|
|
|
CFG80211_CONN_SCAN_AGAIN,
|
|
|
|
CFG80211_CONN_AUTHENTICATE_NEXT,
|
|
|
|
CFG80211_CONN_AUTHENTICATING,
|
|
|
|
CFG80211_CONN_ASSOCIATE_NEXT,
|
|
|
|
CFG80211_CONN_ASSOCIATING,
|
2009-10-20 00:08:53 -06:00
|
|
|
CFG80211_CONN_DEAUTH_ASSOC_FAIL,
|
2009-07-02 01:13:27 -06:00
|
|
|
} state;
|
2009-08-07 06:51:05 -06:00
|
|
|
u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN];
|
2009-07-02 01:13:27 -06:00
|
|
|
u8 *ie;
|
|
|
|
size_t ie_len;
|
2009-08-07 06:51:05 -06:00
|
|
|
bool auto_auth, prev_bssid_valid;
|
2009-07-02 01:13:27 -06:00
|
|
|
};
|
|
|
|
|
2010-01-29 17:58:57 -07:00
|
|
|
bool cfg80211_is_all_idle(void)
|
|
|
|
{
|
|
|
|
struct cfg80211_registered_device *rdev;
|
|
|
|
struct wireless_dev *wdev;
|
|
|
|
bool is_all_idle = true;
|
|
|
|
|
|
|
|
mutex_lock(&cfg80211_mutex);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* All devices must be idle as otherwise if you are actively
|
|
|
|
* scanning some new beacon hints could be learned and would
|
|
|
|
* count as new regulatory hints.
|
|
|
|
*/
|
|
|
|
list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
|
|
|
|
cfg80211_lock_rdev(rdev);
|
|
|
|
list_for_each_entry(wdev, &rdev->netdev_list, list) {
|
|
|
|
wdev_lock(wdev);
|
|
|
|
if (wdev->sme_state != CFG80211_SME_IDLE)
|
|
|
|
is_all_idle = false;
|
|
|
|
wdev_unlock(wdev);
|
|
|
|
}
|
|
|
|
cfg80211_unlock_rdev(rdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cfg80211_mutex);
|
|
|
|
|
|
|
|
return is_all_idle;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void disconnect_work(struct work_struct *work)
|
|
|
|
{
|
|
|
|
if (!cfg80211_is_all_idle())
|
|
|
|
return;
|
|
|
|
|
|
|
|
regulatory_hint_disconnect();
|
|
|
|
}
|
|
|
|
|
|
|
|
static DECLARE_WORK(cfg80211_disconnect_work, disconnect_work);
|
2009-07-02 01:13:27 -06:00
|
|
|
|
|
|
|
static int cfg80211_conn_scan(struct wireless_dev *wdev)
|
|
|
|
{
|
2009-07-06 19:56:12 -06:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
2009-07-02 01:13:27 -06:00
|
|
|
struct cfg80211_scan_request *request;
|
|
|
|
int n_channels, err;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
2009-07-06 19:56:12 -06:00
|
|
|
ASSERT_RDEV_LOCK(rdev);
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-07-06 19:56:12 -06:00
|
|
|
if (rdev->scan_req)
|
2009-07-02 01:13:27 -06:00
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
if (wdev->conn->params.channel) {
|
|
|
|
n_channels = 1;
|
|
|
|
} else {
|
|
|
|
enum ieee80211_band band;
|
|
|
|
n_channels = 0;
|
|
|
|
|
|
|
|
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
|
|
|
|
if (!wdev->wiphy->bands[band])
|
|
|
|
continue;
|
|
|
|
n_channels += wdev->wiphy->bands[band]->n_channels;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
request = kzalloc(sizeof(*request) + sizeof(request->ssids[0]) +
|
|
|
|
sizeof(request->channels[0]) * n_channels,
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!request)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (wdev->conn->params.channel)
|
|
|
|
request->channels[0] = wdev->conn->params.channel;
|
|
|
|
else {
|
|
|
|
int i = 0, j;
|
|
|
|
enum ieee80211_band band;
|
|
|
|
|
|
|
|
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
|
|
|
|
if (!wdev->wiphy->bands[band])
|
|
|
|
continue;
|
|
|
|
for (j = 0; j < wdev->wiphy->bands[band]->n_channels;
|
|
|
|
i++, j++)
|
|
|
|
request->channels[i] =
|
|
|
|
&wdev->wiphy->bands[band]->channels[j];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
request->n_channels = n_channels;
|
2009-08-07 09:54:07 -06:00
|
|
|
request->ssids = (void *)&request->channels[n_channels];
|
2009-07-02 01:13:27 -06:00
|
|
|
request->n_ssids = 1;
|
|
|
|
|
|
|
|
memcpy(request->ssids[0].ssid, wdev->conn->params.ssid,
|
|
|
|
wdev->conn->params.ssid_len);
|
|
|
|
request->ssids[0].ssid_len = wdev->conn->params.ssid_len;
|
|
|
|
|
2009-07-13 16:33:35 -06:00
|
|
|
request->dev = wdev->netdev;
|
2009-07-06 19:56:12 -06:00
|
|
|
request->wiphy = &rdev->wiphy;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-07-06 19:56:12 -06:00
|
|
|
rdev->scan_req = request;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-07-06 19:56:12 -06:00
|
|
|
err = rdev->ops->scan(wdev->wiphy, wdev->netdev, request);
|
2009-07-02 01:13:27 -06:00
|
|
|
if (!err) {
|
|
|
|
wdev->conn->state = CFG80211_CONN_SCANNING;
|
2009-07-06 19:56:12 -06:00
|
|
|
nl80211_send_scan_start(rdev, wdev->netdev);
|
2009-07-13 16:33:35 -06:00
|
|
|
dev_hold(wdev->netdev);
|
2009-07-02 01:13:27 -06:00
|
|
|
} else {
|
2009-07-06 19:56:12 -06:00
|
|
|
rdev->scan_req = NULL;
|
2009-07-02 01:13:27 -06:00
|
|
|
kfree(request);
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cfg80211_conn_do_work(struct wireless_dev *wdev)
|
|
|
|
{
|
2009-07-06 19:56:12 -06:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
2009-07-02 09:20:43 -06:00
|
|
|
struct cfg80211_connect_params *params;
|
2009-08-07 06:51:05 -06:00
|
|
|
const u8 *prev_bssid = NULL;
|
2009-07-02 09:20:43 -06:00
|
|
|
int err;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
if (!wdev->conn)
|
|
|
|
return 0;
|
|
|
|
|
2009-07-02 09:20:43 -06:00
|
|
|
params = &wdev->conn->params;
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
switch (wdev->conn->state) {
|
|
|
|
case CFG80211_CONN_SCAN_AGAIN:
|
|
|
|
return cfg80211_conn_scan(wdev);
|
|
|
|
case CFG80211_CONN_AUTHENTICATE_NEXT:
|
2009-07-06 19:56:12 -06:00
|
|
|
BUG_ON(!rdev->ops->auth);
|
2009-07-02 09:20:43 -06:00
|
|
|
wdev->conn->state = CFG80211_CONN_AUTHENTICATING;
|
2009-07-06 19:56:12 -06:00
|
|
|
return __cfg80211_mlme_auth(rdev, wdev->netdev,
|
2009-07-06 19:56:11 -06:00
|
|
|
params->channel, params->auth_type,
|
|
|
|
params->bssid,
|
|
|
|
params->ssid, params->ssid_len,
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
NULL, 0,
|
|
|
|
params->key, params->key_len,
|
|
|
|
params->key_idx);
|
2009-07-02 01:13:27 -06:00
|
|
|
case CFG80211_CONN_ASSOCIATE_NEXT:
|
2009-07-06 19:56:12 -06:00
|
|
|
BUG_ON(!rdev->ops->assoc);
|
2009-07-02 09:20:43 -06:00
|
|
|
wdev->conn->state = CFG80211_CONN_ASSOCIATING;
|
2009-08-07 06:51:05 -06:00
|
|
|
if (wdev->conn->prev_bssid_valid)
|
|
|
|
prev_bssid = wdev->conn->prev_bssid;
|
2009-07-06 19:56:12 -06:00
|
|
|
err = __cfg80211_mlme_assoc(rdev, wdev->netdev,
|
2009-07-06 19:56:11 -06:00
|
|
|
params->channel, params->bssid,
|
2009-08-07 06:51:05 -06:00
|
|
|
prev_bssid,
|
2009-07-06 19:56:11 -06:00
|
|
|
params->ssid, params->ssid_len,
|
|
|
|
params->ie, params->ie_len,
|
|
|
|
false, ¶ms->crypto);
|
2009-07-02 09:20:43 -06:00
|
|
|
if (err)
|
2009-07-06 19:56:12 -06:00
|
|
|
__cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
|
2009-07-06 19:56:11 -06:00
|
|
|
NULL, 0,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
2009-07-02 09:20:43 -06:00
|
|
|
return err;
|
2009-10-20 00:08:53 -06:00
|
|
|
case CFG80211_CONN_DEAUTH_ASSOC_FAIL:
|
|
|
|
__cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
|
|
|
|
NULL, 0,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
|
|
|
/* return an error so that we call __cfg80211_connect_result() */
|
|
|
|
return -EINVAL;
|
2009-07-02 01:13:27 -06:00
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void cfg80211_conn_work(struct work_struct *work)
|
|
|
|
{
|
2009-07-06 19:56:12 -06:00
|
|
|
struct cfg80211_registered_device *rdev =
|
2009-07-02 01:13:27 -06:00
|
|
|
container_of(work, struct cfg80211_registered_device, conn_work);
|
|
|
|
struct wireless_dev *wdev;
|
2009-10-31 00:40:37 -06:00
|
|
|
u8 bssid_buf[ETH_ALEN], *bssid = NULL;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
|
|
|
rtnl_lock();
|
2009-07-06 19:56:12 -06:00
|
|
|
cfg80211_lock_rdev(rdev);
|
|
|
|
mutex_lock(&rdev->devlist_mtx);
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-07-06 19:56:12 -06:00
|
|
|
list_for_each_entry(wdev, &rdev->netdev_list, list) {
|
2009-07-06 19:56:11 -06:00
|
|
|
wdev_lock(wdev);
|
|
|
|
if (!netif_running(wdev->netdev)) {
|
|
|
|
wdev_unlock(wdev);
|
2009-07-02 01:13:27 -06:00
|
|
|
continue;
|
2009-07-06 19:56:11 -06:00
|
|
|
}
|
|
|
|
if (wdev->sme_state != CFG80211_SME_CONNECTING) {
|
|
|
|
wdev_unlock(wdev);
|
2009-07-02 01:13:27 -06:00
|
|
|
continue;
|
2009-07-06 19:56:11 -06:00
|
|
|
}
|
2009-10-31 00:40:37 -06:00
|
|
|
if (wdev->conn->params.bssid) {
|
|
|
|
memcpy(bssid_buf, wdev->conn->params.bssid, ETH_ALEN);
|
|
|
|
bssid = bssid_buf;
|
|
|
|
}
|
2009-07-02 01:13:27 -06:00
|
|
|
if (cfg80211_conn_do_work(wdev))
|
2009-07-06 19:56:11 -06:00
|
|
|
__cfg80211_connect_result(
|
2009-10-20 00:08:53 -06:00
|
|
|
wdev->netdev, bssid,
|
2009-07-06 19:56:11 -06:00
|
|
|
NULL, 0, NULL, 0,
|
|
|
|
WLAN_STATUS_UNSPECIFIED_FAILURE,
|
2009-07-29 03:23:49 -06:00
|
|
|
false, NULL);
|
2009-07-06 19:56:11 -06:00
|
|
|
wdev_unlock(wdev);
|
2009-07-02 01:13:27 -06:00
|
|
|
}
|
|
|
|
|
2009-07-06 19:56:12 -06:00
|
|
|
mutex_unlock(&rdev->devlist_mtx);
|
|
|
|
cfg80211_unlock_rdev(rdev);
|
2009-07-02 01:13:27 -06:00
|
|
|
rtnl_unlock();
|
|
|
|
}
|
|
|
|
|
2009-09-16 10:04:26 -06:00
|
|
|
static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev)
|
2009-07-02 01:13:27 -06:00
|
|
|
{
|
2009-07-06 19:56:12 -06:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
2009-07-02 01:13:27 -06:00
|
|
|
struct cfg80211_bss *bss;
|
|
|
|
u16 capa = WLAN_CAPABILITY_ESS;
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
if (wdev->conn->params.privacy)
|
|
|
|
capa |= WLAN_CAPABILITY_PRIVACY;
|
|
|
|
|
|
|
|
bss = cfg80211_get_bss(wdev->wiphy, NULL, wdev->conn->params.bssid,
|
|
|
|
wdev->conn->params.ssid,
|
|
|
|
wdev->conn->params.ssid_len,
|
|
|
|
WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_PRIVACY,
|
|
|
|
capa);
|
|
|
|
if (!bss)
|
2009-09-16 10:04:26 -06:00
|
|
|
return NULL;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
|
|
|
memcpy(wdev->conn->bssid, bss->bssid, ETH_ALEN);
|
|
|
|
wdev->conn->params.bssid = wdev->conn->bssid;
|
|
|
|
wdev->conn->params.channel = bss->channel;
|
|
|
|
wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
|
2009-07-06 19:56:12 -06:00
|
|
|
schedule_work(&rdev->conn_work);
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-09-16 10:04:26 -06:00
|
|
|
return bss;
|
2009-07-02 01:13:27 -06:00
|
|
|
}
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
static void __cfg80211_sme_scan_done(struct net_device *dev)
|
2009-07-02 01:13:27 -06:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-07-06 19:56:12 -06:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
2009-09-16 10:04:26 -06:00
|
|
|
struct cfg80211_bss *bss;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
if (wdev->sme_state != CFG80211_SME_CONNECTING)
|
|
|
|
return;
|
|
|
|
|
2009-07-16 03:34:14 -06:00
|
|
|
if (!wdev->conn)
|
2009-07-02 01:13:27 -06:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (wdev->conn->state != CFG80211_CONN_SCANNING &&
|
|
|
|
wdev->conn->state != CFG80211_CONN_SCAN_AGAIN)
|
|
|
|
return;
|
|
|
|
|
2009-09-16 10:04:26 -06:00
|
|
|
bss = cfg80211_get_conn_bss(wdev);
|
|
|
|
if (bss) {
|
|
|
|
cfg80211_put_bss(bss);
|
|
|
|
} else {
|
2009-07-02 01:13:27 -06:00
|
|
|
/* not found */
|
|
|
|
if (wdev->conn->state == CFG80211_CONN_SCAN_AGAIN)
|
2009-07-06 19:56:12 -06:00
|
|
|
schedule_work(&rdev->conn_work);
|
2009-07-02 01:13:27 -06:00
|
|
|
else
|
2009-07-06 19:56:11 -06:00
|
|
|
__cfg80211_connect_result(
|
|
|
|
wdev->netdev,
|
|
|
|
wdev->conn->params.bssid,
|
|
|
|
NULL, 0, NULL, 0,
|
|
|
|
WLAN_STATUS_UNSPECIFIED_FAILURE,
|
2009-07-29 03:23:49 -06:00
|
|
|
false, NULL);
|
2009-07-02 01:13:27 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
void cfg80211_sme_scan_done(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
|
2009-08-07 09:22:35 -06:00
|
|
|
mutex_lock(&wiphy_to_dev(wdev->wiphy)->devlist_mtx);
|
2009-07-06 19:56:11 -06:00
|
|
|
wdev_lock(wdev);
|
|
|
|
__cfg80211_sme_scan_done(dev);
|
|
|
|
wdev_unlock(wdev);
|
2009-08-07 09:22:35 -06:00
|
|
|
mutex_unlock(&wiphy_to_dev(wdev->wiphy)->devlist_mtx);
|
2009-07-06 19:56:11 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void cfg80211_sme_rx_auth(struct net_device *dev,
|
|
|
|
const u8 *buf, size_t len)
|
2009-07-02 01:13:27 -06:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct wiphy *wiphy = wdev->wiphy;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
|
|
|
|
struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
|
|
|
|
u16 status_code = le16_to_cpu(mgmt->u.auth.status_code);
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
/* should only RX auth frames when connecting */
|
|
|
|
if (wdev->sme_state != CFG80211_SME_CONNECTING)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (WARN_ON(!wdev->conn))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (status_code == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG &&
|
|
|
|
wdev->conn->auto_auth &&
|
|
|
|
wdev->conn->params.auth_type != NL80211_AUTHTYPE_NETWORK_EAP) {
|
|
|
|
/* select automatically between only open, shared, leap */
|
|
|
|
switch (wdev->conn->params.auth_type) {
|
|
|
|
case NL80211_AUTHTYPE_OPEN_SYSTEM:
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
if (wdev->connect_keys)
|
|
|
|
wdev->conn->params.auth_type =
|
|
|
|
NL80211_AUTHTYPE_SHARED_KEY;
|
|
|
|
else
|
|
|
|
wdev->conn->params.auth_type =
|
|
|
|
NL80211_AUTHTYPE_NETWORK_EAP;
|
2009-07-02 01:13:27 -06:00
|
|
|
break;
|
|
|
|
case NL80211_AUTHTYPE_SHARED_KEY:
|
|
|
|
wdev->conn->params.auth_type =
|
|
|
|
NL80211_AUTHTYPE_NETWORK_EAP;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* huh? */
|
|
|
|
wdev->conn->params.auth_type =
|
|
|
|
NL80211_AUTHTYPE_OPEN_SYSTEM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
|
|
|
|
schedule_work(&rdev->conn_work);
|
2009-07-02 09:20:43 -06:00
|
|
|
} else if (status_code != WLAN_STATUS_SUCCESS) {
|
2009-07-07 15:46:51 -06:00
|
|
|
__cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
|
2009-07-29 03:23:49 -06:00
|
|
|
status_code, false, NULL);
|
2009-07-02 09:20:43 -06:00
|
|
|
} else if (wdev->sme_state == CFG80211_SME_CONNECTING &&
|
2009-07-02 01:13:27 -06:00
|
|
|
wdev->conn->state == CFG80211_CONN_AUTHENTICATING) {
|
|
|
|
wdev->conn->state = CFG80211_CONN_ASSOCIATE_NEXT;
|
|
|
|
schedule_work(&rdev->conn_work);
|
|
|
|
}
|
|
|
|
}
|
2009-07-01 13:26:54 -06:00
|
|
|
|
2009-08-07 06:51:05 -06:00
|
|
|
bool cfg80211_sme_failed_reassoc(struct wireless_dev *wdev)
|
|
|
|
{
|
|
|
|
struct wiphy *wiphy = wdev->wiphy;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
|
|
|
|
|
|
|
|
if (WARN_ON(!wdev->conn))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!wdev->conn->prev_bssid_valid)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Some stupid APs don't accept reassoc, so we
|
|
|
|
* need to fall back to trying regular assoc.
|
|
|
|
*/
|
|
|
|
wdev->conn->prev_bssid_valid = false;
|
|
|
|
wdev->conn->state = CFG80211_CONN_ASSOCIATE_NEXT;
|
|
|
|
schedule_work(&rdev->conn_work);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2009-10-20 00:08:53 -06:00
|
|
|
void cfg80211_sme_failed_assoc(struct wireless_dev *wdev)
|
|
|
|
{
|
|
|
|
struct wiphy *wiphy = wdev->wiphy;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
|
|
|
|
|
|
|
|
wdev->conn->state = CFG80211_CONN_DEAUTH_ASSOC_FAIL;
|
|
|
|
schedule_work(&rdev->conn_work);
|
|
|
|
}
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
|
|
|
|
const u8 *req_ie, size_t req_ie_len,
|
|
|
|
const u8 *resp_ie, size_t resp_ie_len,
|
2009-07-29 03:23:49 -06:00
|
|
|
u16 status, bool wextev,
|
|
|
|
struct cfg80211_bss *bss)
|
2009-07-01 13:26:54 -06:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-07-30 18:38:09 -06:00
|
|
|
u8 *country_ie;
|
2009-09-29 15:27:28 -06:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-07-01 13:26:54 -06:00
|
|
|
union iwreq_data wrqu;
|
|
|
|
#endif
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-01 13:26:54 -06:00
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
|
|
|
|
return;
|
|
|
|
|
2009-08-21 04:23:49 -06:00
|
|
|
if (wdev->sme_state != CFG80211_SME_CONNECTING)
|
2009-08-17 04:22:14 -06:00
|
|
|
return;
|
|
|
|
|
|
|
|
nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev,
|
2009-07-02 01:58:04 -06:00
|
|
|
bssid, req_ie, req_ie_len,
|
2009-08-17 04:22:14 -06:00
|
|
|
resp_ie, resp_ie_len,
|
|
|
|
status, GFP_KERNEL);
|
2009-07-02 01:58:04 -06:00
|
|
|
|
2009-09-29 15:27:28 -06:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-07-02 01:58:04 -06:00
|
|
|
if (wextev) {
|
|
|
|
if (req_ie && status == WLAN_STATUS_SUCCESS) {
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
wrqu.data.length = req_ie_len;
|
2009-07-19 21:47:44 -06:00
|
|
|
wireless_send_event(dev, IWEVASSOCREQIE, &wrqu, req_ie);
|
2009-07-02 01:58:04 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
if (resp_ie && status == WLAN_STATUS_SUCCESS) {
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
wrqu.data.length = resp_ie_len;
|
|
|
|
wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu, resp_ie);
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
2009-08-07 06:51:05 -06:00
|
|
|
if (bssid && status == WLAN_STATUS_SUCCESS) {
|
2009-07-02 01:58:04 -06:00
|
|
|
memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
|
2009-08-07 06:51:05 -06:00
|
|
|
memcpy(wdev->wext.prev_bssid, bssid, ETH_ALEN);
|
|
|
|
wdev->wext.prev_bssid_valid = true;
|
|
|
|
}
|
2009-07-02 01:58:04 -06:00
|
|
|
wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-07-29 03:23:49 -06:00
|
|
|
if (wdev->current_bss) {
|
|
|
|
cfg80211_unhold_bss(wdev->current_bss);
|
|
|
|
cfg80211_put_bss(&wdev->current_bss->pub);
|
|
|
|
wdev->current_bss = NULL;
|
|
|
|
}
|
|
|
|
|
2009-07-02 09:20:43 -06:00
|
|
|
if (wdev->conn)
|
|
|
|
wdev->conn->state = CFG80211_CONN_IDLE;
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
if (status != WLAN_STATUS_SUCCESS) {
|
2009-07-01 13:26:54 -06:00
|
|
|
wdev->sme_state = CFG80211_SME_IDLE;
|
2009-08-18 17:43:31 -06:00
|
|
|
if (wdev->conn)
|
|
|
|
kfree(wdev->conn->ie);
|
2009-07-02 09:20:43 -06:00
|
|
|
kfree(wdev->conn);
|
|
|
|
wdev->conn = NULL;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
kfree(wdev->connect_keys);
|
|
|
|
wdev->connect_keys = NULL;
|
2009-08-04 01:32:23 -06:00
|
|
|
wdev->ssid_len = 0;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
return;
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
|
2009-07-29 03:23:49 -06:00
|
|
|
if (!bss)
|
|
|
|
bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
|
|
|
|
wdev->ssid, wdev->ssid_len,
|
|
|
|
WLAN_CAPABILITY_ESS,
|
|
|
|
WLAN_CAPABILITY_ESS);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
|
|
|
|
if (WARN_ON(!bss))
|
|
|
|
return;
|
|
|
|
|
|
|
|
cfg80211_hold_bss(bss_from_pub(bss));
|
|
|
|
wdev->current_bss = bss_from_pub(bss);
|
|
|
|
|
|
|
|
wdev->sme_state = CFG80211_SME_CONNECTED;
|
|
|
|
cfg80211_upload_connect_keys(wdev);
|
2009-07-30 18:38:09 -06:00
|
|
|
|
|
|
|
country_ie = (u8 *) ieee80211_bss_get_ie(bss, WLAN_EID_COUNTRY);
|
|
|
|
|
|
|
|
if (!country_ie)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ieee80211_bss_get_ie() ensures we can access:
|
|
|
|
* - country_ie + 2, the start of the country ie data, and
|
|
|
|
* - and country_ie[1] which is the IE length
|
|
|
|
*/
|
|
|
|
regulatory_hint_11d(wdev->wiphy,
|
2010-01-14 18:08:20 -07:00
|
|
|
bss->channel->band,
|
2009-07-30 18:38:09 -06:00
|
|
|
country_ie + 2,
|
|
|
|
country_ie[1]);
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
2009-07-01 13:26:56 -06:00
|
|
|
|
|
|
|
void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
|
|
|
|
const u8 *req_ie, size_t req_ie_len,
|
|
|
|
const u8 *resp_ie, size_t resp_ie_len,
|
|
|
|
u16 status, gfp_t gfp)
|
|
|
|
{
|
2009-07-06 19:56:11 -06:00
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
struct cfg80211_event *ev;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2009-08-21 04:23:49 -06:00
|
|
|
CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTING);
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ev = kzalloc(sizeof(*ev) + req_ie_len + resp_ie_len, gfp);
|
|
|
|
if (!ev)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ev->type = EVENT_CONNECT_RESULT;
|
2009-08-19 02:08:22 -06:00
|
|
|
if (bssid)
|
|
|
|
memcpy(ev->cr.bssid, bssid, ETH_ALEN);
|
2009-07-06 19:56:11 -06:00
|
|
|
ev->cr.req_ie = ((u8 *)ev) + sizeof(*ev);
|
|
|
|
ev->cr.req_ie_len = req_ie_len;
|
|
|
|
memcpy((void *)ev->cr.req_ie, req_ie, req_ie_len);
|
|
|
|
ev->cr.resp_ie = ((u8 *)ev) + sizeof(*ev) + req_ie_len;
|
|
|
|
ev->cr.resp_ie_len = resp_ie_len;
|
|
|
|
memcpy((void *)ev->cr.resp_ie, resp_ie, resp_ie_len);
|
|
|
|
ev->cr.status = status;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&wdev->event_lock, flags);
|
|
|
|
list_add_tail(&ev->list, &wdev->event_list);
|
|
|
|
spin_unlock_irqrestore(&wdev->event_lock, flags);
|
2009-11-25 07:13:00 -07:00
|
|
|
queue_work(cfg80211_wq, &rdev->event_work);
|
2009-07-01 13:26:56 -06:00
|
|
|
}
|
2009-07-01 13:26:54 -06:00
|
|
|
EXPORT_SYMBOL(cfg80211_connect_result);
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
void __cfg80211_roamed(struct wireless_dev *wdev, const u8 *bssid,
|
|
|
|
const u8 *req_ie, size_t req_ie_len,
|
|
|
|
const u8 *resp_ie, size_t resp_ie_len)
|
2009-07-01 13:26:54 -06:00
|
|
|
{
|
|
|
|
struct cfg80211_bss *bss;
|
2009-09-29 15:27:28 -06:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-07-01 13:26:54 -06:00
|
|
|
union iwreq_data wrqu;
|
|
|
|
#endif
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-01 13:26:54 -06:00
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
|
|
|
|
return;
|
|
|
|
|
2009-08-21 04:23:49 -06:00
|
|
|
if (wdev->sme_state != CFG80211_SME_CONNECTED)
|
2009-07-01 13:26:54 -06:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* internal error -- how did we get to CONNECTED w/o BSS? */
|
|
|
|
if (WARN_ON(!wdev->current_bss)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cfg80211_unhold_bss(wdev->current_bss);
|
2009-07-02 09:20:43 -06:00
|
|
|
cfg80211_put_bss(&wdev->current_bss->pub);
|
2009-07-01 13:26:54 -06:00
|
|
|
wdev->current_bss = NULL;
|
|
|
|
|
|
|
|
bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
|
|
|
|
wdev->ssid, wdev->ssid_len,
|
|
|
|
WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
|
|
|
|
|
|
|
|
if (WARN_ON(!bss))
|
|
|
|
return;
|
|
|
|
|
2009-07-02 09:20:43 -06:00
|
|
|
cfg80211_hold_bss(bss_from_pub(bss));
|
|
|
|
wdev->current_bss = bss_from_pub(bss);
|
2009-07-01 13:26:54 -06:00
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
nl80211_send_roamed(wiphy_to_dev(wdev->wiphy), wdev->netdev, bssid,
|
|
|
|
req_ie, req_ie_len, resp_ie, resp_ie_len,
|
|
|
|
GFP_KERNEL);
|
2009-07-01 13:26:54 -06:00
|
|
|
|
2009-09-29 15:27:28 -06:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-07-01 13:26:54 -06:00
|
|
|
if (req_ie) {
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
wrqu.data.length = req_ie_len;
|
2009-07-19 21:47:44 -06:00
|
|
|
wireless_send_event(wdev->netdev, IWEVASSOCREQIE,
|
2009-07-06 19:56:11 -06:00
|
|
|
&wrqu, req_ie);
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
if (resp_ie) {
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
wrqu.data.length = resp_ie_len;
|
2009-07-06 19:56:11 -06:00
|
|
|
wireless_send_event(wdev->netdev, IWEVASSOCRESPIE,
|
|
|
|
&wrqu, resp_ie);
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
|
|
|
memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
|
2009-08-07 06:51:05 -06:00
|
|
|
memcpy(wdev->wext.prev_bssid, bssid, ETH_ALEN);
|
|
|
|
wdev->wext.prev_bssid_valid = true;
|
2009-07-06 19:56:11 -06:00
|
|
|
wireless_send_event(wdev->netdev, SIOCGIWAP, &wrqu, NULL);
|
2009-07-01 13:26:54 -06:00
|
|
|
#endif
|
|
|
|
}
|
2009-07-06 19:56:11 -06:00
|
|
|
|
|
|
|
void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
|
|
|
|
const u8 *req_ie, size_t req_ie_len,
|
|
|
|
const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
struct cfg80211_event *ev;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2009-08-21 04:23:49 -06:00
|
|
|
CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED);
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ev = kzalloc(sizeof(*ev) + req_ie_len + resp_ie_len, gfp);
|
|
|
|
if (!ev)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ev->type = EVENT_ROAMED;
|
|
|
|
memcpy(ev->rm.bssid, bssid, ETH_ALEN);
|
|
|
|
ev->rm.req_ie = ((u8 *)ev) + sizeof(*ev);
|
|
|
|
ev->rm.req_ie_len = req_ie_len;
|
|
|
|
memcpy((void *)ev->rm.req_ie, req_ie, req_ie_len);
|
|
|
|
ev->rm.resp_ie = ((u8 *)ev) + sizeof(*ev) + req_ie_len;
|
|
|
|
ev->rm.resp_ie_len = resp_ie_len;
|
|
|
|
memcpy((void *)ev->rm.resp_ie, resp_ie, resp_ie_len);
|
|
|
|
|
|
|
|
spin_lock_irqsave(&wdev->event_lock, flags);
|
|
|
|
list_add_tail(&ev->list, &wdev->event_list);
|
|
|
|
spin_unlock_irqrestore(&wdev->event_lock, flags);
|
2009-11-25 07:13:00 -07:00
|
|
|
queue_work(cfg80211_wq, &rdev->event_work);
|
2009-07-06 19:56:11 -06:00
|
|
|
}
|
2009-07-01 13:26:54 -06:00
|
|
|
EXPORT_SYMBOL(cfg80211_roamed);
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
|
2009-07-02 01:13:27 -06:00
|
|
|
size_t ie_len, u16 reason, bool from_ap)
|
2009-07-01 13:26:54 -06:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
int i;
|
2009-09-29 15:27:28 -06:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-07-01 13:26:54 -06:00
|
|
|
union iwreq_data wrqu;
|
|
|
|
#endif
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-01 13:26:54 -06:00
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))
|
|
|
|
return;
|
|
|
|
|
2009-08-21 04:23:49 -06:00
|
|
|
if (wdev->sme_state != CFG80211_SME_CONNECTED)
|
2009-07-01 13:26:54 -06:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (wdev->current_bss) {
|
|
|
|
cfg80211_unhold_bss(wdev->current_bss);
|
2009-07-02 09:20:43 -06:00
|
|
|
cfg80211_put_bss(&wdev->current_bss->pub);
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
wdev->current_bss = NULL;
|
|
|
|
wdev->sme_state = CFG80211_SME_IDLE;
|
2009-08-04 01:32:23 -06:00
|
|
|
wdev->ssid_len = 0;
|
2009-07-01 13:26:54 -06:00
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
if (wdev->conn) {
|
2009-08-06 12:41:34 -06:00
|
|
|
const u8 *bssid;
|
|
|
|
int ret;
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
kfree(wdev->conn->ie);
|
|
|
|
wdev->conn->ie = NULL;
|
2009-07-02 09:20:43 -06:00
|
|
|
kfree(wdev->conn);
|
|
|
|
wdev->conn = NULL;
|
2009-08-06 12:41:34 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If this disconnect was due to a disassoc, we
|
|
|
|
* we might still have an auth BSS around. For
|
|
|
|
* the userspace SME that's currently expected,
|
|
|
|
* but for the kernel SME (nl80211 CONNECT or
|
|
|
|
* wireless extensions) we want to clear up all
|
|
|
|
* state.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < MAX_AUTH_BSSES; i++) {
|
|
|
|
if (!wdev->auth_bsses[i])
|
|
|
|
continue;
|
|
|
|
bssid = wdev->auth_bsses[i]->pub.bssid;
|
|
|
|
ret = __cfg80211_mlme_deauth(rdev, dev, bssid, NULL, 0,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
|
|
|
WARN(ret, "deauth failed: %d\n", ret);
|
|
|
|
}
|
2009-07-02 01:13:27 -06:00
|
|
|
}
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
nl80211_send_disconnected(rdev, dev, reason, ie, ie_len, from_ap);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Delete all the keys ... pairwise keys can't really
|
|
|
|
* exist any more anyway, but default keys might.
|
|
|
|
*/
|
|
|
|
if (rdev->ops->del_key)
|
|
|
|
for (i = 0; i < 6; i++)
|
|
|
|
rdev->ops->del_key(wdev->wiphy, dev, i, NULL);
|
2009-07-01 13:26:54 -06:00
|
|
|
|
2009-09-29 15:27:28 -06:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-07-01 13:26:54 -06:00
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
|
|
|
wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
|
2010-01-13 14:23:14 -07:00
|
|
|
wdev->wext.connect.ssid_len = 0;
|
2009-07-01 13:26:54 -06:00
|
|
|
#endif
|
2010-01-29 17:58:57 -07:00
|
|
|
|
|
|
|
schedule_work(&cfg80211_disconnect_work);
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void cfg80211_disconnected(struct net_device *dev, u16 reason,
|
|
|
|
u8 *ie, size_t ie_len, gfp_t gfp)
|
|
|
|
{
|
2009-07-06 19:56:11 -06:00
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
struct cfg80211_event *ev;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2009-08-21 04:23:49 -06:00
|
|
|
CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED);
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ev = kzalloc(sizeof(*ev) + ie_len, gfp);
|
|
|
|
if (!ev)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ev->type = EVENT_DISCONNECTED;
|
|
|
|
ev->dc.ie = ((u8 *)ev) + sizeof(*ev);
|
|
|
|
ev->dc.ie_len = ie_len;
|
|
|
|
memcpy((void *)ev->dc.ie, ie, ie_len);
|
|
|
|
ev->dc.reason = reason;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&wdev->event_lock, flags);
|
|
|
|
list_add_tail(&ev->list, &wdev->event_list);
|
|
|
|
spin_unlock_irqrestore(&wdev->event_lock, flags);
|
2009-11-25 07:13:00 -07:00
|
|
|
queue_work(cfg80211_wq, &rdev->event_work);
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(cfg80211_disconnected);
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
int __cfg80211_connect(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev,
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
struct cfg80211_connect_params *connect,
|
2009-08-07 06:51:05 -06:00
|
|
|
struct cfg80211_cached_keys *connkeys,
|
|
|
|
const u8 *prev_bssid)
|
2009-07-01 13:26:54 -06:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-08-07 09:22:35 -06:00
|
|
|
struct ieee80211_channel *chan;
|
2009-09-16 10:04:26 -06:00
|
|
|
struct cfg80211_bss *bss = NULL;
|
2009-07-06 19:56:11 -06:00
|
|
|
int err;
|
|
|
|
|
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
2009-07-01 13:26:54 -06:00
|
|
|
|
|
|
|
if (wdev->sme_state != CFG80211_SME_IDLE)
|
|
|
|
return -EALREADY;
|
|
|
|
|
2009-08-07 09:22:35 -06:00
|
|
|
chan = rdev_fixed_channel(rdev, wdev);
|
|
|
|
if (chan && chan != connect->channel)
|
|
|
|
return -EBUSY;
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
if (WARN_ON(wdev->connect_keys)) {
|
|
|
|
kfree(wdev->connect_keys);
|
|
|
|
wdev->connect_keys = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (connkeys && connkeys->def >= 0) {
|
|
|
|
int idx;
|
2009-08-06 13:04:41 -06:00
|
|
|
u32 cipher;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
|
|
|
|
idx = connkeys->def;
|
2009-08-06 13:04:41 -06:00
|
|
|
cipher = connkeys->params[idx].cipher;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
/* If given a WEP key we may need it for shared key auth */
|
2009-08-06 13:04:41 -06:00
|
|
|
if (cipher == WLAN_CIPHER_SUITE_WEP40 ||
|
|
|
|
cipher == WLAN_CIPHER_SUITE_WEP104) {
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
connect->key_idx = idx;
|
|
|
|
connect->key = connkeys->params[idx].key;
|
|
|
|
connect->key_len = connkeys->params[idx].key_len;
|
2009-08-06 13:04:41 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If ciphers are not set (e.g. when going through
|
|
|
|
* iwconfig), we have to set them appropriately here.
|
|
|
|
*/
|
|
|
|
if (connect->crypto.cipher_group == 0)
|
|
|
|
connect->crypto.cipher_group = cipher;
|
|
|
|
|
|
|
|
if (connect->crypto.n_ciphers_pairwise == 0) {
|
|
|
|
connect->crypto.n_ciphers_pairwise = 1;
|
|
|
|
connect->crypto.ciphers_pairwise[0] = cipher;
|
|
|
|
}
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-01 13:26:54 -06:00
|
|
|
if (!rdev->ops->connect) {
|
2009-07-02 01:13:27 -06:00
|
|
|
if (!rdev->ops->auth || !rdev->ops->assoc)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2009-07-02 09:20:43 -06:00
|
|
|
if (WARN_ON(wdev->conn))
|
|
|
|
return -EINPROGRESS;
|
|
|
|
|
|
|
|
wdev->conn = kzalloc(sizeof(*wdev->conn), GFP_KERNEL);
|
|
|
|
if (!wdev->conn)
|
|
|
|
return -ENOMEM;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy all parameters, and treat explicitly IEs, BSSID, SSID.
|
|
|
|
*/
|
|
|
|
memcpy(&wdev->conn->params, connect, sizeof(*connect));
|
|
|
|
if (connect->bssid) {
|
|
|
|
wdev->conn->params.bssid = wdev->conn->bssid;
|
|
|
|
memcpy(wdev->conn->bssid, connect->bssid, ETH_ALEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (connect->ie) {
|
|
|
|
wdev->conn->ie = kmemdup(connect->ie, connect->ie_len,
|
|
|
|
GFP_KERNEL);
|
|
|
|
wdev->conn->params.ie = wdev->conn->ie;
|
2009-07-02 09:20:43 -06:00
|
|
|
if (!wdev->conn->ie) {
|
|
|
|
kfree(wdev->conn);
|
|
|
|
wdev->conn = NULL;
|
2009-07-02 01:13:27 -06:00
|
|
|
return -ENOMEM;
|
2009-07-02 09:20:43 -06:00
|
|
|
}
|
2009-07-02 01:13:27 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
if (connect->auth_type == NL80211_AUTHTYPE_AUTOMATIC) {
|
|
|
|
wdev->conn->auto_auth = true;
|
|
|
|
/* start with open system ... should mostly work */
|
|
|
|
wdev->conn->params.auth_type =
|
|
|
|
NL80211_AUTHTYPE_OPEN_SYSTEM;
|
|
|
|
} else {
|
|
|
|
wdev->conn->auto_auth = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(wdev->ssid, connect->ssid, connect->ssid_len);
|
|
|
|
wdev->ssid_len = connect->ssid_len;
|
|
|
|
wdev->conn->params.ssid = wdev->ssid;
|
|
|
|
wdev->conn->params.ssid_len = connect->ssid_len;
|
|
|
|
|
2009-09-26 06:42:53 -06:00
|
|
|
/* see if we have the bss already */
|
|
|
|
bss = cfg80211_get_conn_bss(wdev);
|
2009-07-02 01:13:27 -06:00
|
|
|
|
|
|
|
wdev->sme_state = CFG80211_SME_CONNECTING;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
wdev->connect_keys = connkeys;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-08-07 06:51:05 -06:00
|
|
|
if (prev_bssid) {
|
|
|
|
memcpy(wdev->conn->prev_bssid, prev_bssid, ETH_ALEN);
|
|
|
|
wdev->conn->prev_bssid_valid = true;
|
|
|
|
}
|
|
|
|
|
2009-09-16 10:04:26 -06:00
|
|
|
/* we're good if we have a matching bss struct */
|
|
|
|
if (bss) {
|
2009-07-02 01:13:27 -06:00
|
|
|
wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
|
|
|
|
err = cfg80211_conn_do_work(wdev);
|
2009-09-16 10:04:26 -06:00
|
|
|
cfg80211_put_bss(bss);
|
2009-07-02 01:13:27 -06:00
|
|
|
} else {
|
|
|
|
/* otherwise we'll need to scan for the AP first */
|
|
|
|
err = cfg80211_conn_scan(wdev);
|
|
|
|
/*
|
|
|
|
* If we can't scan right now, then we need to scan again
|
|
|
|
* after the current scan finished, since the parameters
|
|
|
|
* changed (unless we find a good AP anyway).
|
|
|
|
*/
|
|
|
|
if (err == -EBUSY) {
|
|
|
|
err = 0;
|
|
|
|
wdev->conn->state = CFG80211_CONN_SCAN_AGAIN;
|
|
|
|
}
|
|
|
|
}
|
2009-07-02 09:20:43 -06:00
|
|
|
if (err) {
|
2009-08-18 17:43:31 -06:00
|
|
|
kfree(wdev->conn->ie);
|
2009-07-02 09:20:43 -06:00
|
|
|
kfree(wdev->conn);
|
|
|
|
wdev->conn = NULL;
|
2009-07-02 01:13:27 -06:00
|
|
|
wdev->sme_state = CFG80211_SME_IDLE;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
wdev->connect_keys = NULL;
|
2009-08-04 01:32:23 -06:00
|
|
|
wdev->ssid_len = 0;
|
2009-07-02 09:20:43 -06:00
|
|
|
}
|
2009-07-02 01:13:27 -06:00
|
|
|
|
|
|
|
return err;
|
2009-07-01 13:26:54 -06:00
|
|
|
} else {
|
|
|
|
wdev->sme_state = CFG80211_SME_CONNECTING;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
wdev->connect_keys = connkeys;
|
2009-07-01 13:26:54 -06:00
|
|
|
err = rdev->ops->connect(&rdev->wiphy, dev, connect);
|
|
|
|
if (err) {
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
wdev->connect_keys = NULL;
|
2009-07-01 13:26:54 -06:00
|
|
|
wdev->sme_state = CFG80211_SME_IDLE;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
memcpy(wdev->ssid, connect->ssid, connect->ssid_len);
|
|
|
|
wdev->ssid_len = connect->ssid_len;
|
2009-07-01 13:26:54 -06:00
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
return 0;
|
|
|
|
}
|
2009-07-01 13:26:54 -06:00
|
|
|
}
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
int cfg80211_connect(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev,
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
struct cfg80211_connect_params *connect,
|
|
|
|
struct cfg80211_cached_keys *connkeys)
|
2009-07-06 19:56:11 -06:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2009-08-07 09:22:35 -06:00
|
|
|
mutex_lock(&rdev->devlist_mtx);
|
2009-07-06 19:56:11 -06:00
|
|
|
wdev_lock(dev->ieee80211_ptr);
|
2009-08-07 06:51:05 -06:00
|
|
|
err = __cfg80211_connect(rdev, dev, connect, connkeys, NULL);
|
2009-07-06 19:56:11 -06:00
|
|
|
wdev_unlock(dev->ieee80211_ptr);
|
2009-08-07 09:22:35 -06:00
|
|
|
mutex_unlock(&rdev->devlist_mtx);
|
2009-07-06 19:56:11 -06:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
int __cfg80211_disconnect(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev, u16 reason, bool wextev)
|
2009-07-01 13:26:54 -06:00
|
|
|
{
|
2009-07-02 01:13:27 -06:00
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-07-01 13:26:54 -06:00
|
|
|
int err;
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
if (wdev->sme_state == CFG80211_SME_IDLE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 06:22:54 -06:00
|
|
|
kfree(wdev->connect_keys);
|
|
|
|
wdev->connect_keys = NULL;
|
|
|
|
|
2009-07-01 13:26:54 -06:00
|
|
|
if (!rdev->ops->disconnect) {
|
2009-07-02 09:20:43 -06:00
|
|
|
if (!rdev->ops->deauth)
|
|
|
|
return -EOPNOTSUPP;
|
2009-07-02 01:13:27 -06:00
|
|
|
|
2009-07-02 09:20:43 -06:00
|
|
|
/* was it connected by userspace SME? */
|
|
|
|
if (!wdev->conn) {
|
|
|
|
cfg80211_mlme_down(rdev, dev);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-07-02 01:13:27 -06:00
|
|
|
|
|
|
|
if (wdev->sme_state == CFG80211_SME_CONNECTING &&
|
|
|
|
(wdev->conn->state == CFG80211_CONN_SCANNING ||
|
|
|
|
wdev->conn->state == CFG80211_CONN_SCAN_AGAIN)) {
|
|
|
|
wdev->sme_state = CFG80211_SME_IDLE;
|
2009-08-18 17:43:31 -06:00
|
|
|
kfree(wdev->conn->ie);
|
2009-07-02 09:20:43 -06:00
|
|
|
kfree(wdev->conn);
|
|
|
|
wdev->conn = NULL;
|
2009-08-04 01:32:23 -06:00
|
|
|
wdev->ssid_len = 0;
|
2009-07-02 01:13:27 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* wdev->conn->params.bssid must be set if > SCANNING */
|
2009-07-06 19:56:11 -06:00
|
|
|
err = __cfg80211_mlme_deauth(rdev, dev,
|
|
|
|
wdev->conn->params.bssid,
|
|
|
|
NULL, 0, reason);
|
2009-07-02 01:13:27 -06:00
|
|
|
if (err)
|
|
|
|
return err;
|
2009-07-01 13:26:54 -06:00
|
|
|
} else {
|
|
|
|
err = rdev->ops->disconnect(&rdev->wiphy, dev, reason);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-07-02 01:13:27 -06:00
|
|
|
if (wdev->sme_state == CFG80211_SME_CONNECTED)
|
2009-07-06 19:56:11 -06:00
|
|
|
__cfg80211_disconnected(dev, NULL, 0, 0, false);
|
2009-07-02 01:13:27 -06:00
|
|
|
else if (wdev->sme_state == CFG80211_SME_CONNECTING)
|
2009-07-01 13:26:56 -06:00
|
|
|
__cfg80211_connect_result(dev, NULL, NULL, 0, NULL, 0,
|
|
|
|
WLAN_STATUS_UNSPECIFIED_FAILURE,
|
2009-07-29 03:23:49 -06:00
|
|
|
wextev, NULL);
|
2009-07-01 13:26:54 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2009-07-02 09:20:43 -06:00
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev,
|
|
|
|
u16 reason, bool wextev)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
wdev_lock(dev->ieee80211_ptr);
|
|
|
|
err = __cfg80211_disconnect(rdev, dev, reason, wextev);
|
|
|
|
wdev_unlock(dev->ieee80211_ptr);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-07-02 09:20:43 -06:00
|
|
|
void cfg80211_sme_disassoc(struct net_device *dev, int idx)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
|
2009-07-06 19:56:11 -06:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-02 09:20:43 -06:00
|
|
|
if (!wdev->conn)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (wdev->conn->state == CFG80211_CONN_IDLE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ok, so the association was made by this SME -- we don't
|
|
|
|
* want it any more so deauthenticate too.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (!wdev->auth_bsses[idx])
|
|
|
|
return;
|
|
|
|
|
|
|
|
memcpy(bssid, wdev->auth_bsses[idx]->pub.bssid, ETH_ALEN);
|
2009-07-09 18:45:38 -06:00
|
|
|
if (__cfg80211_mlme_deauth(rdev, dev, bssid,
|
|
|
|
NULL, 0, WLAN_REASON_DEAUTH_LEAVING)) {
|
2009-07-02 09:20:43 -06:00
|
|
|
/* whatever -- assume gone anyway */
|
|
|
|
cfg80211_unhold_bss(wdev->auth_bsses[idx]);
|
|
|
|
cfg80211_put_bss(&wdev->auth_bsses[idx]->pub);
|
|
|
|
wdev->auth_bsses[idx] = NULL;
|
|
|
|
}
|
|
|
|
}
|