commit bacd348254d6710280c50e896b8e8f417e63633f
author Service qcabuildsw <qcabuildsw@localhost> Mon Sep 19 12:39:03 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 19 12:39:03 2016 -0700
tree d1e7f8842bed73d3cee4c0e0bb9c925af3870f4e
parent d48c54a4e8667a9e1291b0f7258a062d1efeb058
parent 3b21c7e93d7a05a3d287c7e44028e4161b51d4ee

Merge "qcacld-3.0: Fix possible NULL pointer dereference for sta_ds" into wlan-cld3.driver.lnx.1.1-dev

core/mac/src/pe/lim/lim_api.c

diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 426f622..0ed539e 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1902,6 +1902,11 @@
 	lim_delete_tdls_peers(mac_ctx, session_ptr);
 	curr_sta_ds = dph_lookup_hash_entry(mac_ctx, session_ptr->bssId,
 			&aid, &session_ptr->dph.dphHashTable);
+	if (curr_sta_ds == NULL) {
+		lim_log(mac_ctx, LOGE, FL("LFR3:failed to lookup hash entry"));
+		ft_session_ptr->bRoamSynchInProgress = false;
+		return status;
+	}
 	local_nss = curr_sta_ds->nss;
 	session_ptr->limSmeState = eLIM_SME_IDLE_STATE;
 	lim_cleanup_rx_path(mac_ctx, curr_sta_ds, session_ptr);