netdev: Add sanity checks
In the case we get a connect or authenticate event, make sure we're actually trying to connect. Otherwise, it could be another supplicant is running
This commit is contained in:
parent
303490261f
commit
4e421cfc8f
18
src/netdev.c
18
src/netdev.c
|
@ -1277,12 +1277,14 @@ static void netdev_connect_event(struct l_genl_msg *msg,
|
||||||
const uint8_t *rsne = NULL;
|
const uint8_t *rsne = NULL;
|
||||||
const uint8_t *mde = NULL;
|
const uint8_t *mde = NULL;
|
||||||
const uint8_t *fte = NULL;
|
const uint8_t *fte = NULL;
|
||||||
bool is_rsn = netdev->handshake->own_ie != NULL;
|
|
||||||
|
|
||||||
l_debug("");
|
l_debug("");
|
||||||
|
|
||||||
if (!netdev->connected)
|
if (!netdev->connected) {
|
||||||
|
l_warn("Unexpected connection related event -- "
|
||||||
|
"is another supplicant running?");
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!l_genl_attr_init(&attr, msg)) {
|
if (!l_genl_attr_init(&attr, msg)) {
|
||||||
l_debug("attr init failed");
|
l_debug("attr init failed");
|
||||||
|
@ -1355,6 +1357,8 @@ static void netdev_connect_event(struct l_genl_msg *msg,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (netdev->in_ft) {
|
if (netdev->in_ft) {
|
||||||
|
bool is_rsn = netdev->handshake->own_ie != NULL;
|
||||||
|
|
||||||
netdev->in_ft = false;
|
netdev->in_ft = false;
|
||||||
netdev->operational = true;
|
netdev->operational = true;
|
||||||
|
|
||||||
|
@ -1566,10 +1570,16 @@ static void netdev_authenticate_event(struct l_genl_msg *msg,
|
||||||
const uint8_t *mde = NULL;
|
const uint8_t *mde = NULL;
|
||||||
const uint8_t *fte = NULL;
|
const uint8_t *fte = NULL;
|
||||||
struct handshake_state *hs = netdev->handshake;
|
struct handshake_state *hs = netdev->handshake;
|
||||||
bool is_rsn = hs->own_ie != NULL;
|
bool is_rsn;
|
||||||
|
|
||||||
l_debug("");
|
l_debug("");
|
||||||
|
|
||||||
|
if (!netdev->connected) {
|
||||||
|
l_warn("Unexpected connection related event -- "
|
||||||
|
"is another supplicant running?");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* During Fast Transition we use the authenticate event to start the
|
* During Fast Transition we use the authenticate event to start the
|
||||||
* reassociation step because the FTE necessary before we can build
|
* reassociation step because the FTE necessary before we can build
|
||||||
|
@ -1650,6 +1660,8 @@ static void netdev_authenticate_event(struct l_genl_msg *msg,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is_rsn = hs->own_ie != NULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* In an RSN, check for an RSNE containing the PMK-R0-Name and
|
* In an RSN, check for an RSNE containing the PMK-R0-Name and
|
||||||
* the remaining fields same as in the advertised RSNE.
|
* the remaining fields same as in the advertised RSNE.
|
||||||
|
|
Loading…
Reference in New Issue