diff options
author | Hai Shalom <haishalom@google.com> | 2019-02-04 12:53:10 -0800 |
---|---|---|
committer | Vasyl Gello <vasek.gello@gmail.com> | 2019-05-07 07:14:58 +0300 |
commit | 65d4363d575db67047308b9fb02c3cd1a8a6e6d6 (patch) | |
tree | f1ba59d56d83c5994686c0f66d541c13819d0822 | |
parent | c760900066f0d125d3a93cb5058322ac8bea51bb (diff) | |
download | android_external_wpa_supplicant_8-cm-14.1.tar.gz android_external_wpa_supplicant_8-cm-14.1.tar.bz2 android_external_wpa_supplicant_8-cm-14.1.zip |
[wpa_supplicant] Fix security vulnerability wpa_supplicant/wnm_sta.c:376cm-14.1
Fix Security Vulnerability - Security Report - [Out of bounds read in
wnm_parse_neighbor_report_elem in external/wpa_supplicant_8/wpa_supplicant/wnm_sta.c:376]
Bug: 122074159
Test: Connect to AP, run traffic
Test: Run poc_wnm_sta_376 on device, comfirm new error message appears
Change-Id: If0ff673d2536135469144ee69b3f4e1831be73bf
(cherry picked from commit cb95c3f41acb3bcdd6477b59f945554bc1849465)
(cherry picked from commit 5e6e3f710fd8f317f479fc9b7a5bfed1bef89f9f)
-rw-r--r-- | wpa_supplicant/wnm_sta.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c index bef20748..1f498d7e 100644 --- a/wpa_supplicant/wnm_sta.c +++ b/wpa_supplicant/wnm_sta.c @@ -373,6 +373,10 @@ static void wnm_parse_neighbor_report_elem(struct neighbor_report *rep, rep->preference_present = 1; break; case WNM_NEIGHBOR_BSS_TERMINATION_DURATION: + if (elen < 10) { + wpa_printf(MSG_DEBUG, "WNM: Too short bss_term_tsf"); + break; + } rep->bss_term_tsf = WPA_GET_LE64(pos); rep->bss_term_dur = WPA_GET_LE16(pos + 8); rep->bss_term_present = 1; |