aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHai Shalom <haishalom@google.com>2019-02-04 12:53:10 -0800
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-03-13 20:14:16 +0000
commit0bcc99c696a1352aa9de5280d2c84fe6cbb1c40c (patch)
tree9f72f8d993b7d6ffef411f9bbf1aff28553dcdab
parent8bb10d724c4ecb822c16826ba20b9669bfd212a6 (diff)
downloadwpa_supplicant_8-0bcc99c696a1352aa9de5280d2c84fe6cbb1c40c.tar.gz
[wpa_supplicant] Fix security vulnerability wpa_supplicant/wnm_sta.c:376
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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index bd0b5172..05b9f6c2 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;