diff options
| author | Jouni Malinen <j@w1.fi> | 2015-11-01 18:18:17 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-11-11 19:40:00 +0200 |
| commit | d1106abdd415ea5b0f2c20ac1c92bf1aa6765696 (patch) | |
| tree | 56bfcd34e8f1884f96441a828cf070f539421913 | |
| parent | f1a1108336d99f58b6e72f6b0796f834cd616515 (diff) | |
| download | android_external_wpa_supplicant_8-d1106abdd415ea5b0f2c20ac1c92bf1aa6765696.tar.gz android_external_wpa_supplicant_8-d1106abdd415ea5b0f2c20ac1c92bf1aa6765696.tar.bz2 android_external_wpa_supplicant_8-d1106abdd415ea5b0f2c20ac1c92bf1aa6765696.zip | |
EAP-pwd peer: Fix last fragment length validation
All but the last fragment had their length checked against the remaining
room in the reassembly buffer. This allowed a suitably constructed last
fragment frame to try to add extra data that would go beyond the buffer.
The length validation code in wpabuf_put_data() prevents an actual
buffer write overflow from occurring, but this results in process
termination. (CVE-2015-5315)
Change-Id: Ie5c25b7890abb1d62dcfe0ac14dbf277d321fc3d
Signed-off-by: Jouni Malinen <j@w1.fi>
| -rw-r--r-- | src/eap_peer/eap_pwd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c index d67703bb..0036bcf8 100644 --- a/src/eap_peer/eap_pwd.c +++ b/src/eap_peer/eap_pwd.c @@ -802,7 +802,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, /* * buffer and ACK the fragment */ - if (EAP_PWD_GET_MORE_BIT(lm_exch)) { + if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) { data->in_frag_pos += len; if (data->in_frag_pos > wpabuf_size(data->inbuf)) { wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack " @@ -814,7 +814,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, return NULL; } wpabuf_put_data(data->inbuf, pos, len); - + } + if (EAP_PWD_GET_MORE_BIT(lm_exch)) { resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD, EAP_PWD_HDR_SIZE, EAP_CODE_RESPONSE, eap_get_id(reqData)); @@ -828,10 +829,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, * we're buffering and this is the last fragment */ if (data->in_frag_pos) { - wpabuf_put_data(data->inbuf, pos, len); wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes", (int) len); - data->in_frag_pos += len; pos = wpabuf_head_u8(data->inbuf); len = data->in_frag_pos; } |