commit 81bcd112ed651bf138dc4ce0da4463895b2011a5
author Linux Build Service Account <lnxbuild@localhost> Fri Dec 18 02:57:59 2020 -0800
committer Linux Build Service Account <lnxbuild@localhost> Fri Dec 18 02:57:59 2020 -0800
tree 6b00d7551f57d9c757549b1b8d67042cac828a94
parent c2206dd1646330e1fc34cc150157ca3fd6836fae
parent c7c46b9ef8c5c4bd1621df80a54630997091a9f4

Merge c7c46b9ef8c5c4bd1621df80a54630997091a9f4 on remote branch

Change-Id: I137d56902aa10e621d40c8a6fcc5afeb8ae66a26

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 ffa18d0..4f74af1 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8275,10 +8275,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;
    }