diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2017-08-16 15:32:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-16 15:32:58 -0700 |
| commit | a5032a29a4c5c3b4bc445195fffb3ea680462432 (patch) | |
| tree | 7e6a03beeb1cafb05e595bad5464a0ca1f9e527c | |
| parent | 6938acd48da6e7661261215433a4644506826356 (diff) | |
| parent | 15276527d78b639be4e564ee518a50ca2929d56f (diff) | |
Merge "qcacld-3.0: Fix regression in wlan_hdd_add_hostapd_conf_vsie api" into wlan-cld3.driver.lnx.1.1
| -rw-r--r-- | core/hdd/src/wlan_hdd_hostapd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 622dffd019db..2b3aec01882c 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -6906,12 +6906,13 @@ static void wlan_hdd_add_hostapd_conf_vsie(hdd_adapter_t *pHostapdAdapter, elem_id = ptr[0]; elem_len = ptr[1]; left -= 2; - if (elem_len > left || elem_len < WPS_OUI_TYPE_SIZE) { + if (elem_len > left) { hdd_err("**Invalid IEs eid: %d elem_len: %d left: %d**", elem_id, elem_len, left); return; } - if (IE_EID_VENDOR == elem_id) { + if (IE_EID_VENDOR == elem_id && + (elem_len >= WPS_OUI_TYPE_SIZE)) { /* skipping the VSIE's which we don't want to include or * it will be included by existing code */ |