From: Jouni Malinen Date: Tue, 29 Jan 2013 15:33:34 +0000 (-0800) Subject: GAS: Ignore replays if previous frag_id without dropping GAS session X-Git-Tag: aosp-kk-from-upstream~234 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e1ecab1c5c4c3c583fd18fd77566b467b0b9de8;p=thirdparty%2Fhostap.git GAS: Ignore replays if previous frag_id without dropping GAS session It looks like it may be possible for an older GAS response to get retransmitted even after the first copy has been processed. While this should not really come up all the way to wpa_supplicant due to sequence number being same (i.e., duplicate detection should from the frame), some cases have been observed where this did cause issues. Drop such a frame silently without dropping the ongoing GAS session to allow a frame with the next frag_id to be processed after this. Signed-hostap: Jouni Malinen --- diff --git a/wpa_supplicant/gas_query.c b/wpa_supplicant/gas_query.c index 27bcc7aa6..09d308a20 100644 --- a/wpa_supplicant/gas_query.c +++ b/wpa_supplicant/gas_query.c @@ -271,6 +271,11 @@ static void gas_query_rx_comeback(struct gas_query *gas, if (frag_id != query->next_frag_id) { wpa_printf(MSG_DEBUG, "GAS: Unexpected frag_id in response " "from " MACSTR, MAC2STR(query->addr)); + if (frag_id + 1 == query->next_frag_id) { + wpa_printf(MSG_DEBUG, "GAS: Drop frame as possible " + "retry of previous fragment"); + return; + } gas_query_done(gas, query, GAS_QUERY_PEER_ERROR); return; }