diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-09-13 20:12:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-13 20:12:26 -0700 |
| commit | da29ebb2754677bdd480ad2f0ee341bb0d31a1b4 (patch) | |
| tree | 02289cd5ef6430e20835a47fea1b778f09caa279 | |
| parent | 4eef2466a4456202715bfe413ef93cc3990b92fc (diff) | |
| parent | b9c40ef17b8e48ba84631f1dc025e70d7b0d9a13 (diff) | |
Merge "qcacld-2.0: Fix the NULL pointer operation issue" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 94a0dd12165d..12aa210ccdd3 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -17105,6 +17105,16 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t* pHostapdAdapter) pConfig = &pHostapdAdapter->sessionCtx.ap.sapConfig; pBeacon = pHostapdAdapter->sessionCtx.ap.beacon; + /* FIx CR2299453 that the pHostapdAdapter->sessionCtx.ap.beacon will be + * set NULL during ap stop at function wlan_hdd_cfg80211_stop_ap() + * but then received fw indicator 0x6 and trigger driver reset, and then + * cause this NULL pointer operation when re-init. + */ + if (pBeacon == NULL) { + hddLog(LOGE, FL("Invalid pointer pBeacon = NULL!")); + return -EINVAL; + } + genie = vos_mem_malloc(MAX_GENIE_LEN); if(genie == NULL) { |