aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-11-01 18:18:17 +0200
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2015-11-11 08:36:41 -0800
commit80473f8f050655f117cdeb22af265c0a2360149b (patch)
treec89755d05c1194e3b33001e7884597c0be850ebd /src
parent1a3bf6bafbc0472157ce56bc11df41bd6449512b (diff)
downloadandroid_external_wpa_supplicant_8-80473f8f050655f117cdeb22af265c0a2360149b.tar.gz
android_external_wpa_supplicant_8-80473f8f050655f117cdeb22af265c0a2360149b.tar.bz2
android_external_wpa_supplicant_8-80473f8f050655f117cdeb22af265c0a2360149b.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. CYNGNOS-1299 Change-Id: Ie5c25b7890abb1d62dcfe0ac14dbf277d321fc3d Signed-off-by: Jouni Malinen <j@w1.fi> (cherry picked from commit bac9fa8f61ff322bc3d33912c77e9f6d6ba5f4ad)
Diffstat (limited to 'src')
-rw-r--r--src/eap_peer/eap_pwd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
index 46bd217c..77e78c0b 100644
--- a/src/eap_peer/eap_pwd.c
+++ b/src/eap_peer/eap_pwd.c
@@ -843,7 +843,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 "
@@ -856,7 +856,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));
@@ -870,10 +871,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;
}