Revert "wlan: Null pointer dereference in MTRACE in HDD."
This reverts commit 43f9493593eec7f0d663ed56d49e995b32bb0195.
Change-Id: I317d560f26d547d4b93c30272f5e77b6449f868d
CRs-Fixed: 687985
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 3c872d3..2d14f63 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5131,12 +5131,7 @@
return -ENODEV;
}
pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_CHANNEL, pAdapter->sessionId,
channel_type ));
@@ -5733,16 +5728,11 @@
struct beacon_parameters *params)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *pHddCtx = NULL;
+ hdd_context_t *pHddCtx;
int status;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_ADD_BEACON,
pAdapter->sessionId, params->interval));
@@ -5799,19 +5789,19 @@
struct beacon_parameters *params)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_station_ctx_t *pHddStaCtx = NULL;
- hdd_context_t *pHddCtx = NULL;
+ hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+ hdd_context_t *pHddCtx;
int status;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+ MTRACE(vos_trace(VOS_MODULE_ID_HDD,
+ TRACE_CODE_HDD_CFG80211_SET_BEACON,
+ pAdapter->sessionId, pHddStaCtx->conn_info.authType));
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %s (%d)",
+ __func__, hdd_device_modetoString(pAdapter->device_mode),
+ pAdapter->device_mode);
+
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
@@ -5820,12 +5810,7 @@
"%s: HDD context is not valid", __func__);
return status;
}
- MTRACE(vos_trace(VOS_MODULE_ID_HDD,
- TRACE_CODE_HDD_CFG80211_SET_BEACON,
- pAdapter->sessionId, pHddStaCtx->conn_info.authType));
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %s (%d)",
- __func__, hdd_device_modetoString(pAdapter->device_mode),
- pAdapter->device_mode);
+
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
)
@@ -5880,7 +5865,7 @@
if (NULL == pAdapter)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: HDD adapter context is Null", __func__);
return -ENODEV;
}
@@ -6114,16 +6099,11 @@
struct cfg80211_beacon_data *params)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *pHddCtx = NULL;
+ hdd_context_t *pHddCtx;
int status;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CHANGE_BEACON,
pAdapter->sessionId, pAdapter->device_mode));
@@ -6183,12 +6163,7 @@
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CHANGE_BSS,
pAdapter->sessionId, params->ap_isolate));
@@ -6891,7 +6866,7 @@
if ((NULL == pAdapter))
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"invalid adapter ");
return -EINVAL;
}
@@ -7076,12 +7051,7 @@
hdd_context_t *pHddCtx;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_ADD_KEY,
pAdapter->sessionId, params->key_len));
@@ -7471,23 +7441,16 @@
#endif
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( ndev );
- hdd_wext_state_t *pWextState= NULL;
- tCsrRoamProfile *pRoamProfile = NULL;
+ hdd_wext_state_t *pWextState= WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
+ tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile);
struct key_params params;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %s (%d)",
__func__, hdd_device_modetoString(pAdapter->device_mode),
pAdapter->device_mode);
- pWextState= WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
- pRoamProfile = &(pWextState->roamProfile);
+
memset(¶ms, 0, sizeof(params));
if (CSR_MAX_NUM_KEY <= key_index)
@@ -7524,9 +7487,11 @@
params.cipher = IW_AUTH_CIPHER_NONE;
break;
}
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_GET_KEY,
pAdapter->sessionId, params.cipher));
+
params.key_len = pRoamProfile->Keys.KeyLength[key_index];
params.seq_len = 0;
params.seq = NULL;
@@ -7701,7 +7666,7 @@
if ((NULL == pAdapter))
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"invalid adapter");
return -EINVAL;
}
@@ -8143,7 +8108,7 @@
hdd_adapter_t *pAdapter
)
{
- tHalHandle hHal = NULL;
+ tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
tCsrScanResultInfo *pScanResult;
eHalStatus status = 0;
tScanResultHandle pResult;
@@ -8151,13 +8116,7 @@
hdd_context_t *pHddCtx;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
- hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_UPDATE_BSS,
NO_SESSION, pAdapter->sessionId));
@@ -8682,9 +8641,11 @@
ENTER();
+
hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %s (%d)",
__func__, hdd_device_modetoString(pAdapter->device_mode),
pAdapter->device_mode);
+
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
@@ -10112,15 +10073,10 @@
int status;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( ndev );
VOS_STATUS exitbmpsStatus = VOS_STATUS_E_INVAL;
- hdd_context_t *pHddCtx = NULL;
+ hdd_context_t *pHddCtx;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CONNECT,
pAdapter->sessionId, pAdapter->device_mode));
@@ -10310,21 +10266,17 @@
)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
- tCsrRoamProfile *pRoamProfile = NULL;
+ tCsrRoamProfile *pRoamProfile =
+ &(WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter))->roamProfile;
int status;
- hdd_station_ctx_t *pHddStaCtx = NULL;
- hdd_context_t *pHddCtx = NULL;
+ hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+ hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
#ifdef FEATURE_WLAN_TDLS
tANI_U8 staIdx;
#endif
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_DISCONNECT,
pAdapter->sessionId, reason));
@@ -10335,9 +10287,6 @@
hddLog(VOS_TRACE_LEVEL_INFO, "%s: Disconnect called with reason code %d",
__func__, reason);
- pRoamProfile = &(WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter))->roamProfile;
- pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
@@ -10545,16 +10494,11 @@
tCsrRoamProfile *pRoamProfile;
int status;
bool alloc_bssid = VOS_FALSE;
- hdd_station_ctx_t *pHddStaCtx = NULL;
- hdd_context_t *pHddCtx = NULL;
+ hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+ hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_JOIN_IBSS,
pAdapter->sessionId, pAdapter->device_mode));
@@ -10563,8 +10507,6 @@
hdd_device_modetoString(pAdapter->device_mode),
pAdapter->device_mode);
- pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
@@ -10735,23 +10677,16 @@
)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
- hdd_wext_state_t *pWextState = NULL;
- tCsrRoamProfile *pRoamProfile = NULL;
- hdd_context_t *pHddCtx = NULL;
+ hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
+ tCsrRoamProfile *pRoamProfile;
+ hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
int status;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_LEAVE_IBSS,
pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE));
- pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
- pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
@@ -11762,12 +11697,7 @@
#ifdef FEATURE_WLAN_TDLS
u32 mask, set;
ENTER();
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_ADD_STA,
pAdapter->sessionId, params->listen_interval));
@@ -12281,7 +12211,7 @@
if (NULL == pAdapter)
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: HDD adapter is Null", __func__);
return -ENODEV;
}
@@ -12550,7 +12480,7 @@
if (NULL == pAdapter)
{
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: HDD adapter is Null", __func__);
return -ENODEV;
}
@@ -12669,12 +12599,7 @@
u32 peer_capability = 0;
#endif
tANI_U16 numCurrTdlsPeers;
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TDLS_MGMT,
pAdapter->sessionId, action_code));
@@ -12891,12 +12816,7 @@
hdd_context_t *pHddCtx = wiphy_priv(wiphy);
int status;
hddTdlsPeer_t *pTdlsPeer;
- if (NULL == pAdapter)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD adapter context is Null", __func__);
- return -ENODEV;
- }
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TDLS_OPER,
pAdapter->sessionId, oper));
@@ -13264,7 +13184,7 @@
if (NULL == pAdapter)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: HDD adapter is Null", __func__);
return -ENODEV;
}