diff options
| author | achigoliu <achigoliu@google.com> | 2021-06-07 17:00:45 +0800 |
|---|---|---|
| committer | Achigo Liu <achigoliu@google.com> | 2021-06-07 10:22:19 +0000 |
| commit | 1cf6c0a38a59ee2f4873e54387b3f65a9d76504a (patch) | |
| tree | 30a76c9df47b7eb358794dfe443a465656a8c063 | |
| parent | 2dca8c60427f8dea425dbe926854e477e617bf33 (diff) | |
| parent | 16abcfbc1aa398accc5583ca6f9c4c41e1a40098 (diff) | |
| download | qca-wfi-host-cmn-1cf6c0a38a59ee2f4873e54387b3f65a9d76504a.tar.gz | |
Merge remote-tracking branch 'android-msm-barbet-4.19-rvc-security' into android-msm-barbet-4.19-rvc
Aug 2021.1
Bug: 189715888
Bug: 189715042
Change-Id: I63eedce965f031c99291a594f7a3f1e876f0ce80
| -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; } |