diff options
| author | Jouni Malinen <j@w1.fi> | 2015-11-01 18:24:16 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-11-11 19:40:00 +0200 |
| commit | f1a1108336d99f58b6e72f6b0796f834cd616515 (patch) | |
| tree | 6a6fc84872a5bfae82e2ed7d85129327c8a78742 | |
| parent | 77ebbf58dee1b16f4429321dc2ddef557dc21803 (diff) | |
| download | android_external_wpa_supplicant_8-f1a1108336d99f58b6e72f6b0796f834cd616515.tar.gz android_external_wpa_supplicant_8-f1a1108336d99f58b6e72f6b0796f834cd616515.tar.bz2 android_external_wpa_supplicant_8-f1a1108336d99f58b6e72f6b0796f834cd616515.zip | |
EAP-pwd server: 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-5314)
Change-Id: I84bd2c3993a88f87fba71854b37671411bc2a651
Signed-off-by: Jouni Malinen <j@w1.fi>
| -rw-r--r-- | src/eap_server/eap_server_pwd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c index ac0bd043..2ad965b9 100644 --- a/src/eap_server/eap_server_pwd.c +++ b/src/eap_server/eap_server_pwd.c @@ -934,7 +934,7 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, /* * the first and all intermediate fragments have the M bit set */ - if (EAP_PWD_GET_MORE_BIT(lm_exch)) { + if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) { if ((data->in_frag_pos + len) > wpabuf_size(data->inbuf)) { wpa_printf(MSG_DEBUG, "EAP-pwd: Buffer overflow " "attack detected! (%d+%d > %d)", @@ -945,6 +945,8 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, } wpabuf_put_data(data->inbuf, pos, len); data->in_frag_pos += len; + } + if (EAP_PWD_GET_MORE_BIT(lm_exch)) { wpa_printf(MSG_DEBUG, "EAP-pwd: Got a %d byte fragment", (int) len); return; @@ -954,8 +956,6 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, * buffering fragments so that's how we know it's the last) */ if (data->in_frag_pos) { - wpabuf_put_data(data->inbuf, pos, len); - data->in_frag_pos += len; pos = wpabuf_head_u8(data->inbuf); len = data->in_frag_pos; wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes", |