Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 17:59:25 +01:00
Code Releases Activity

eap: add NULL checks

Browse Source 
1. Enforce implementation of handle_request function

2. In case of unimplemented handle_retransmit try to use
   handle_request instead and rely on method specific
   mechanism to restart the conversation if necessary

3. Make method->free implementation unrequired
This commit is contained in:
Tim Kourt 2018-01-23 11:42:44 -08:00 committed by Denis Kenzior
parent 4ed442b8b8
commit 91b6efaf66
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/eap.c
View File

@ -86,7 +86,7 @@ void eap_set_event_func(struct eap_state *eap, eap_event_func_t func)
void eap_free(struct eap_state *eap) void eap_free(struct eap_state *eap)
{ {
if (eap->method_state) if (eap->method_state && eap->method->free)
eap->method->free(eap); eap->method->free(eap);
if (eap->identity) if (eap->identity)
@ -195,7 +195,8 @@ static void eap_handle_request(struct eap_state *eap, uint16_t id,
} }
if (id == eap->last_id) if (id == eap->last_id)
op = eap->method->handle_retransmit; op = eap->method->handle_retransmit ? :
eap->method->handle_request;
else else
op = eap->method->handle_request; op = eap->method->handle_request;
@ -318,7 +319,7 @@ void eap_rx_packet(struct eap_state *eap, const uint8_t *pkt, size_t len)
*/ */
return; return;
if (eap->method_state) if (eap->method_state && eap->method->free)
eap->method->free(eap); eap->method->free(eap);
eap->method = NULL; eap->method = NULL;
@ -391,7 +392,7 @@ bool eap_load_settings(struct eap_state *eap, struct l_settings *settings,
return true; return true;
err: err:
if (eap->method_state) if (eap->method_state && eap->method->free)
eap->method->free(eap); eap->method->free(eap);
eap->method = NULL; eap->method = NULL;
@ -455,6 +456,9 @@ void eap_restore_last_id(struct eap_state *eap, uint8_t last_id)
int eap_register_method(struct eap_method *method) int eap_register_method(struct eap_method *method)
{ {
if (!method->handle_request)
return -EPERM;
l_queue_push_head(eap_methods, method); l_queue_push_head(eap_methods, method);
return 0; return 0;
} }