diff options
| author | Jouni Malinen <j@w1.fi> | 2015-11-01 18:24:16 +0200 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-12-02 23:51:32 +0530 |
| commit | 272a91bcb9634c3048d3de74691f13c5d753d373 (patch) | |
| tree | faccb62ffd9cff997cb0382a6fa8744727036d73 /src/eap_server | |
| parent | 9de86a75d0702aa212dc889b6b9149ad672140d2 (diff) | |
| download | android_external_wpa_supplicant_8-272a91bcb9634c3048d3de74691f13c5d753d373.tar.gz android_external_wpa_supplicant_8-272a91bcb9634c3048d3de74691f13c5d753d373.tar.bz2 android_external_wpa_supplicant_8-272a91bcb9634c3048d3de74691f13c5d753d373.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)
Signed-off-by: Jouni Malinen <j@w1.fi>
Git-commit: bef802ece03f9ae9d52a21f0cf4f1bc2c5a1f8aa
Git-repo: git://w1.fi/srv/git/hostap.git
Change-Id: Ia283ce184fc880e2fcf7e60e40952cbfc2961709
CRs-Fixed: 937515
Diffstat (limited to 'src/eap_server')
| -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 cb83ff73..9f787ab3 100644 --- a/src/eap_server/eap_server_pwd.c +++ b/src/eap_server/eap_server_pwd.c @@ -970,7 +970,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)", @@ -981,6 +981,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; @@ -990,8 +992,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", |