commit 3740d295e07c4198b521ecae2425d6404b364a21
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Thu Aug 30 09:02:08 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 30 09:02:08 2018 -0700
tree beeb846973cd47514bd6981ed8ad431af4375c54
parent b8289440f52c0e6a41db7846494ee647fbdbab6c
parent bcfbafa063df0cf3eae2774f3affa832716e5523

Merge "prima: NULL pointer dereference of hdd context" into wlan-driver.lnx.1.0

CORE/VOSS/src/vos_nvitem.c

diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 97482e5..35ab905 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -3726,7 +3726,8 @@
                     (IEEE80211_CHAN_RADAR | IEEE80211_CHAN_PASSIVE_SCAN |
                     IEEE80211_CHAN_INDOOR_ONLY )))
             {
-                if (pHddCtx->cfg_ini->indoor_channel_support == false &&
+                if (pHddCtx && pHddCtx->cfg_ini &&
+                    pHddCtx->cfg_ini->indoor_channel_support == false &&
                     wiphy->bands[i]->channels[j].flags &
                     IEEE80211_CHAN_INDOOR_ONLY)
                     wiphy->bands[i]->channels[j].flags |=
@@ -3740,9 +3741,10 @@
                 else
 #endif
                 {
-                    if ((pHddCtx->cfg_ini->indoor_channel_support == true &&
-                          wiphy->bands[i]->channels[j].flags &
-                          IEEE80211_CHAN_INDOOR_ONLY)) {
+                    if ((pHddCtx && pHddCtx->cfg_ini &&
+                         pHddCtx->cfg_ini->indoor_channel_support == true &&
+                         wiphy->bands[i]->channels[j].flags &
+                         IEEE80211_CHAN_INDOOR_ONLY)) {
                         pnvEFSTable->halnv.tables.regDomains[temp_reg_domain].\
                             channels[k].enabled = NV_CHANNEL_ENABLE;
                     } else {