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

EAP-pwd peer: Fix reassembly buffer handling

Browse source 
Unexpected fragment might result in data->inbuf not being allocated
before processing and that could have resulted in NULL pointer
dereference. Fix that by explicitly checking for data->inbuf to be
available before using it.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-04-17 02:21:20 +03:00 • committed by Jouni Malinen
parent a143bdc0d1
commit d2d1a324ce
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/eap_peer/eap_pwd.c
View file

@ -932,6 +932,13 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
* buffer and ACK the fragment * buffer and ACK the fragment
*/ */
if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) { if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) {
if (!data->inbuf) {
wpa_printf(MSG_DEBUG,
"EAP-pwd: No buffer for reassembly");
ret->methodState = METHOD_DONE;
ret->decision = DECISION_FAIL;
return NULL;
}
data->in_frag_pos += len; data->in_frag_pos += len;
if (data->in_frag_pos > wpabuf_size(data->inbuf)) { if (data->in_frag_pos > wpabuf_size(data->inbuf)) {
wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack " wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack "
@ -958,7 +965,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
/* /*
* we're buffering and this is the last fragment * we're buffering and this is the last fragment
*/ */
if (data->in_frag_pos) { if (data->in_frag_pos && data->inbuf) {
wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes", wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes",
(int) len); (int) len);
pos = wpabuf_head_u8(data->inbuf); pos = wpabuf_head_u8(data->inbuf);