DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

EAP-AKA: Check that ID message storing succeeds

Browse source 
This could fail in theory if running out of memory, so better check for
this explicitly instead of allowing the exchange to continue and fail
later due to checkcode mismatch.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2021-02-07 19:29:23 +02:00
parent e781f7c860
commit bd8b170302
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/eap_peer/eap_aka.c
View file

@ -442,19 +442,28 @@ static int eap_aka_learn_ids(struct eap_sm *sm, struct eap_aka_data *data,
static int eap_aka_add_id_msg(struct eap_aka_data *data, static int eap_aka_add_id_msg(struct eap_aka_data *data,
const struct wpabuf *msg) const struct wpabuf *msg1,
const struct wpabuf *msg2)
{ {
if (msg == NULL) size_t len;
return -1;
if (data->id_msgs == NULL) { if (!msg1)
data->id_msgs = wpabuf_dup(msg); return -1;
return data->id_msgs == NULL ? -1 : 0; len = wpabuf_len(msg1);
if (msg2)
len += wpabuf_len(msg2);
if (!data->id_msgs) {
data->id_msgs = wpabuf_alloc(len);
if (!data->id_msgs)
return -1;
} else if (wpabuf_resize(&data->id_msgs, len) < 0) {
return -1;
} }
if (wpabuf_resize(&data->id_msgs, wpabuf_len(msg)) < 0) wpabuf_put_buf(data->id_msgs, msg1);
return -1; if (msg2)
wpabuf_put_buf(data->id_msgs, msg); wpabuf_put_buf(data->id_msgs, msg2);
return 0; return 0;
} }
@ -799,8 +808,13 @@ static struct wpabuf * eap_aka_process_identity(struct eap_sm *sm,
buf = eap_aka_response_identity(sm, data, id, attr->id_req); buf = eap_aka_response_identity(sm, data, id, attr->id_req);
if (data->prev_id != id) { if (data->prev_id != id) {
eap_aka_add_id_msg(data, reqData); if (eap_aka_add_id_msg(data, reqData, buf) < 0) {
eap_aka_add_id_msg(data, buf); wpa_printf(MSG_INFO,
"EAP-AKA: Failed to store ID messages");
wpabuf_free(buf);
return eap_aka_client_error(
data, id, EAP_AKA_UNABLE_TO_PROCESS_PACKET);
}
data->prev_id = id; data->prev_id = id;
} }

3
tests/hwsim/test_eap_proto.py
View file

@ -5629,8 +5629,7 @@ def test_eap_proto_aka_errors(dev, apdev):
tests = [(1, "=eap_aka_learn_ids"), tests = [(1, "=eap_aka_learn_ids"),
(2, "=eap_aka_learn_ids"), (2, "=eap_aka_learn_ids"),
(1, "eap_sim_parse_encr;eap_aka_process_challenge"), (1, "eap_sim_parse_encr;eap_aka_process_challenge"),
(1, "wpabuf_dup;eap_aka_add_id_msg"), (1, "wpabuf_alloc;eap_aka_add_id_msg"),
(1, "wpabuf_resize;eap_aka_add_id_msg"),
(1, "eap_aka_getKey"), (1, "eap_aka_getKey"),
(1, "eap_aka_get_emsk"), (1, "eap_aka_get_emsk"),
(1, "eap_aka_get_session_id")] (1, "eap_aka_get_session_id")]