diff options
| author | Eva Huang <evahuang@google.com> | 2021-06-03 20:22:48 +0800 |
|---|---|---|
| committer | Eva Huang <evahuang@google.com> | 2021-06-03 20:22:48 +0800 |
| commit | e40e2622db45e7461ec43d3ed393b7a5a61f46c1 (patch) | |
| tree | 30a76c9df47b7eb358794dfe443a465656a8c063 | |
| parent | b0455c86c64fcaa4bd0008f69b153ed7b49fef39 (diff) | |
| parent | 6f60b826ab8d9d65a608961054e63325e84a704d (diff) | |
| download | qca-wfi-host-cmn-e40e2622db45e7461ec43d3ed393b7a5a61f46c1.tar.gz | |
Merge branch 'android-msm-pixel-4.19-rvc-security' into android-msm-pixel-4.19-rvc-qpr3android-11.0.0_r0.100
Aug 2021.1
Bug: 189715888
Change-Id: I7e2510f0b1d97ea72ae908563e2044f7ddcc1f69
| -rw-r--r-- | umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h b/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h index 61b0e2038..d8d688e58 100644 --- a/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h +++ b/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h @@ -1611,7 +1611,8 @@ static inline QDF_STATUS wlan_parse_rsn_ie(uint8_t *rsn_ie, rsn->pmkid_count = LE_READ_2(ie); ie += 2; rem_len -= 2; - if (rsn->pmkid_count > (unsigned int) rem_len / PMKID_LEN) { + if (rsn->pmkid_count > MAX_PMKID || + rsn->pmkid_count > (unsigned int)rem_len / PMKID_LEN) { rsn->pmkid_count = 0; return QDF_STATUS_E_INVAL; } |