Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-10-04 02:18:49 +02:00
Code Releases Activity

netdev: added checks for station/ap iftype

Browse Source 
These checks allow both a station and authenticator to use
the same netdev key install functions. For NEW_KEY and
SET_STATION, the iftype is checked and either handshake->aa
or ->spa is used as the station address for the KEY/STATION
commands. Also, in the failure cases, a disconnect command
is issued only if the iftype is station as this doesn't
apply to AP.
This commit is contained in:
James Prestwood 2018-06-22 11:13:28 -07:00 committed by Denis Kenzior
parent aac00bf33a
commit b81a9482b4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/netdev.c
View File

@ -944,6 +944,9 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,
netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED;
if (netdev->type != NL80211_IFTYPE_STATION)
return;
msg = netdev_build_cmd_disconnect(netdev,
MMPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
@ -1191,6 +1194,8 @@ static void netdev_new_pairwise_key_cb(struct l_genl_msg *msg, void *data)
{
struct netdev_handshake_state *nhs = data;
struct netdev *netdev = nhs->netdev;
const uint8_t *addr = (netdev->type == NL80211_IFTYPE_STATION) ?
nhs->super.aa : nhs->super.spa;
nhs->pairwise_new_key_cmd_id = 0;
@ -1205,7 +1210,7 @@ static void netdev_new_pairwise_key_cb(struct l_genl_msg *msg, void *data)
* we're already operational, it will not hurt during re-keying
* and is necessary after an FT.
*/
msg = netdev_build_cmd_set_station(netdev, netdev->handshake->aa);
msg = netdev_build_cmd_set_station(netdev, addr);
nhs->set_station_cmd_id =
l_genl_family_send(nl80211, msg, netdev_set_station_cb,
@ -1248,6 +1253,8 @@ static void netdev_set_tk(struct handshake_state *hs,
struct netdev *netdev = nhs->netdev;
struct l_genl_msg *msg;
enum mmpdu_reason_code rc;
const uint8_t *addr = (netdev->type == NL80211_IFTYPE_STATION) ?
nhs->super.aa : nhs->super.spa;
l_debug("%d", netdev->index);
@ -1256,7 +1263,7 @@ static void netdev_set_tk(struct handshake_state *hs,
goto invalid_key;
rc = MMPDU_REASON_CODE_UNSPECIFIED;
msg = netdev_build_cmd_new_key_pairwise(netdev, cipher, hs->aa, tk_buf,
msg = netdev_build_cmd_new_key_pairwise(netdev, cipher, addr, tk_buf,
crypto_cipher_key_len(cipher));
nhs->pairwise_new_key_cmd_id =
l_genl_family_send(nl80211, msg, netdev_new_pairwise_key_cb,
@ -1286,6 +1293,10 @@ static void netdev_handshake_failed(uint32_t ifindex,
netdev->sm = NULL;
netdev->result = NETDEV_RESULT_HANDSHAKE_FAILED;
if (netdev->type != NL80211_IFTYPE_STATION)
return;
msg = netdev_build_cmd_disconnect(netdev, reason_code);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_connect_failed,
@ -1343,6 +1354,9 @@ static void netdev_set_rekey_offload(uint32_t ifindex,
if (!netdev)
return;
if (netdev->type != NL80211_IFTYPE_STATION)
return;
if (!netdev->rekey_offload_support)
return;