Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 02:02:33 +01:00
Code Releases Activity

eapol: Set a timeout for preauthentication

Browse Source 
Wait 1 second for the first EAP frame to be received, after that wait up
to 3 seconds for all of EAP to complete.
This commit is contained in:
Andrew Zaborowski 2017-08-25 01:48:04 +02:00 committed by Denis Kenzior
parent 9bb19526d9
commit eda160de12
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/eapol.c
View File

@ -1719,8 +1719,12 @@ struct preauth_sm {
eapol_preauth_cb_t cb; eapol_preauth_cb_t cb;
eapol_preauth_destroy_func_t destroy; eapol_preauth_destroy_func_t destroy;
void *user_data; void *user_data;
struct l_timeout *timeout;
bool initial_rx:1;
}; };
#define EAPOL_TIMEOUT_SEC 1
static void preauth_sm_destroy(void *value) static void preauth_sm_destroy(void *value)
{ {
struct preauth_sm *sm = value; struct preauth_sm *sm = value;
@ -1729,6 +1733,7 @@ static void preauth_sm_destroy(void *value)
sm->destroy(sm->user_data); sm->destroy(sm->user_data);
eap_free(sm->eap); eap_free(sm->eap);
l_timeout_remove(sm->timeout);
l_free(sm); l_free(sm);
} }
@ -1777,6 +1782,19 @@ static void preauth_rx_packet(struct preauth_sm *sm,
if (eh->packet_type != 0) /* EAPOL-EAP */ if (eh->packet_type != 0) /* EAPOL-EAP */
return; return;
if (!sm->initial_rx) {
sm->initial_rx = true;
/*
* Initial frame from authenticator received, it's alive
* so set a longer timeout. The timeout is for the whole
* EAP exchange as we have no way to monitor the
* negotiation progress and keep rearming the timer each
* time progress is made.
*/
l_timeout_modify(sm->timeout, EAPOL_TIMEOUT_SEC * 3);
}
eap_rx_packet(sm->eap, frame + 4, L_BE16_TO_CPU(eh->packet_len)); eap_rx_packet(sm->eap, frame + 4, L_BE16_TO_CPU(eh->packet_len));
} }
@ -1833,6 +1851,19 @@ msk_short:
preauth_sm_destroy(sm); preauth_sm_destroy(sm);
} }
static void preauth_timeout(struct l_timeout *timeout, void *user_data)
{
struct preauth_sm *sm = user_data;
l_error("Preauthentication timeout");
l_queue_remove(preauths, sm);
sm->cb(NULL, sm->user_data);
preauth_sm_destroy(sm);
}
struct preauth_sm *eapol_preauth_start(const uint8_t *aa, struct preauth_sm *eapol_preauth_start(const uint8_t *aa,
const struct handshake_state *hs, const struct handshake_state *hs,
eapol_preauth_cb_t cb, void *user_data, eapol_preauth_cb_t cb, void *user_data,
@ -1858,6 +1889,9 @@ struct preauth_sm *eapol_preauth_start(const uint8_t *aa,
eap_set_key_material_func(sm->eap, preauth_eap_results_cb); eap_set_key_material_func(sm->eap, preauth_eap_results_cb);
sm->timeout = l_timeout_create(EAPOL_TIMEOUT_SEC, preauth_timeout,
sm, NULL);
l_queue_push_head(preauths, sm); l_queue_push_head(preauths, sm);
/* Send EAPOL-Start */ /* Send EAPOL-Start */