diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-27 23:27:22 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-27 23:27:22 +0000 |
commit | f3138c0b6b91797276cd75d6e6fc691123119c2d (patch) | |
tree | 4adcbb702513c5657d2490497842d640791484ea | |
parent | 88f155cf6e3c2314ff96f88e1b8eebe411150021 (diff) | |
parent | 7899587b4b28e85da84f856ee0c79b23955539d6 (diff) | |
download | wpa_supplicant_8-android10-qpr3-s1-release.tar.gz |
Snap for 6341266 from 7899587b4b28e85da84f856ee0c79b23955539d6 to qt-qpr3-releaseandroid-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-release
Change-Id: Ibd4d847e0ebc2af7f4b0dab10dad79fd4a851409
-rw-r--r-- | src/ap/drv_callbacks.c | 13 | ||||
-rw-r--r-- | src/ap/ieee802_11.c | 12 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index 952a3d55..e3844d97 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, "hostapd_notif_assoc: Skip event with no address"); return -1; } + + if (is_multicast_ether_addr(addr) || + is_zero_ether_addr(addr) || + os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { + /* Do not process any frames with unexpected/invalid SA so that + * we do not add any state for unexpected STA addresses or end + * up sending out frames to unexpected destination. */ + wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR + " in received indication - ignore this indication silently", + __func__, MAC2STR(addr)); + return 0; + } + random_add_randomness(addr, ETH_ALEN); hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 5cd25626..36161c2b 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -4461,6 +4461,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, fc = le_to_host16(mgmt->frame_control); stype = WLAN_FC_GET_STYPE(fc); + if (is_multicast_ether_addr(mgmt->sa) || + is_zero_ether_addr(mgmt->sa) || + os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { + /* Do not process any frames with unexpected/invalid SA so that + * we do not add any state for unexpected STA addresses or end + * up sending out frames to unexpected destination. */ + wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR + " in received frame - ignore this frame silently", + MAC2STR(mgmt->sa)); + return 0; + } + if (stype == WLAN_FC_STYPE_BEACON) { handle_beacon(hapd, mgmt, len, fi); return 1; |