commit 72c526769d67f146aa1cbb09b629034d11bead3a
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 20 14:24:48 2021 -0800
committer Linux Build Service Account <lnxbuild@localhost> Wed Jan 20 14:24:48 2021 -0800
tree 4f5734e432cc1c03a472265c612f83e054d13806
parent 81bcd112ed651bf138dc4ce0da4463895b2011a5
parent 5a770e47bc63b08aa1d4ad575fd907fa0aa8de22

Merge 5a770e47bc63b08aa1d4ad575fd907fa0aa8de22 on remote branch

Change-Id: Ic28e4bd51cb5beef34e9ee6cacd343bae6c934d1

CORE/HDD/src/wlan_hdd_hostapd.c

diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 0cce477..c2d917e 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -190,12 +190,13 @@
    pHddCtx = (hdd_context_t*)pAdapter->pHddCtx;
    MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
                     pAdapter->sessionId, pAdapter->device_mode));
-   if (NULL == pHddCtx)
+   if (wlan_hdd_validate_context(pHddCtx))
    {
       VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
-         "%s: HDD context is Null", __func__);
+         "%s: HDD context is Invalid", __func__);
       return -ENODEV;
    }
+
    status = hdd_get_front_adapter ( pHddCtx, &pAdapterNode );
    while ( (NULL != pAdapterNode) && (VOS_STATUS_SUCCESS == status) )
    {

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 73027d1..67d86ce 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8235,10 +8235,10 @@
    pHddCtx = (hdd_context_t*)pAdapter->pHddCtx;
    MTRACE(vos_trace(VOS_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
                     pAdapter->sessionId, pAdapter->device_mode));
-   if (NULL == pHddCtx)
+   if (wlan_hdd_validate_context(pHddCtx))
    {
       VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
-         "%s: HDD context is Null", __func__);
+         "%s: HDD context is Invalid", __func__);
       return -ENODEV;
    }