From 2a3185a495faa4fc7f18b3fbe2fdab00749710d6 Mon Sep 17 00:00:00 2001
From: Rachit Kankane <rkankane@codeaurora.org>
Date: Thu, 30 May 2019 12:07:32 +0530
Subject: [PATCH] qcacld-3.0: Check for ongoing deauth / disassoc

As a SAP, there are two paths to deauthenticate peer STA as:
1. Deauth issued from south bound interface (peer sending deauth etc)
2. Used issued deauth from upper layer (via hostapd_cli)

We have a race condition when deauth comes for the same peer from both
the ways resulting into process one after another.
This is happening since no check is being done at north bound interface
before issuing deauth request to SME.

Adding a check validate if deauth already in-progress for the mentioned
peer before issuing deauth req.

Change-Id: I2050cf5558dbdf6d656694c39e9f1e461e17bf01
CRs-Fixed: 2459967
---
 core/sme/src/csr/csr_api_roam.c | 83 +++++++++++++++++----------------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 77a7ebd78d06..bf55f485aa40 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -3612,6 +3612,43 @@ QDF_STATUS csr_roam_issue_disassociate(struct mac_context *mac, uint32_t session
 	return status;
 }
 
+/*
+ * csr_is_deauth_disassoc_already_active() - Function to check if deauth or
+ *  disassoc is already in progress.
+ * @mac_ctx: Global MAC context
+ * @session_id: session id
+ * @peer_macaddr: Peer MAC address
+ *
+ * Return: True if deauth/disassoc indication can be dropped
+ *  else false
+ */
+static bool csr_is_deauth_disassoc_already_active(struct mac_context *mac_ctx,
+						  uint8_t session_id,
+					       struct qdf_mac_addr peer_macaddr)
+{
+	bool ret = false;
+	tSmeCmd *sme_cmd = wlan_serialization_get_active_cmd(mac_ctx->psoc,
+							     session_id,
+						 WLAN_SER_CMD_FORCE_DEAUTH_STA);
+	if (!sme_cmd)
+		sme_cmd = wlan_serialization_get_active_cmd(mac_ctx->psoc,
+							    session_id,
+					       WLAN_SER_CMD_FORCE_DISASSOC_STA);
+	if (!sme_cmd)
+		sme_cmd = wlan_serialization_get_active_cmd(mac_ctx->psoc,
+							    session_id,
+						 WLAN_SER_CMD_WM_STATUS_CHANGE);
+
+	if (sme_cmd && !qdf_mem_cmp(peer_macaddr.bytes,
+			sme_cmd->u.roamCmd.peerMac, QDF_MAC_ADDR_SIZE)) {
+		sme_debug("Ignore DEAUTH_IND/DIASSOC_IND as Deauth/Disassoc already in progress for %pM",
+			  peer_macaddr.bytes);
+		ret = true;
+	}
+
+	return ret;
+}
+
 /**
  * csr_roam_issue_disassociate_sta_cmd() - disassociate a associated station
  * @sessionId:     Session Id for Soft AP
@@ -3631,6 +3668,9 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(struct mac_context *mac,
 	tSmeCmd *pCommand;
 
 	do {
+		if (csr_is_deauth_disassoc_already_active(mac, sessionId,
+					      p_del_sta_params->peerMacAddr))
+			break;
 		pCommand = csr_get_command_buffer(mac);
 		if (!pCommand) {
 			sme_err("fail to get command buffer");
@@ -3670,6 +3710,9 @@ QDF_STATUS csr_roam_issue_deauth_sta_cmd(struct mac_context *mac,
 	tSmeCmd *pCommand;
 
 	do {
+		if (csr_is_deauth_disassoc_already_active(mac, sessionId,
+					      pDelStaParams->peerMacAddr))
+			break;
 		pCommand = csr_get_command_buffer(mac);
 		if (!pCommand) {
 			sme_err("fail to get command buffer");
@@ -11402,46 +11445,6 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	qdf_mem_free(roam_info);
 }
 
-/*
- * csr_is_deauth_disassoc_already_active() - Function to check if deauth or
- *  disassoc is already in progress.
- * @mac_ctx: Global MAC context
- * @session_id: session id
- * @peer_macaddr: Peer MAC address
- *
- * Return: True if deauth/disassoc indication can be dropped
- *  else false
- */
-static bool csr_is_deauth_disassoc_already_active(struct mac_context *mac_ctx,
-					       uint8_t session_id,
-					       struct qdf_mac_addr peer_macaddr)
-{
-	bool ret = false;
-	tSmeCmd *sme_cmd;
-
-	sme_cmd = wlan_serialization_get_active_cmd(mac_ctx->psoc, session_id,
-						 WLAN_SER_CMD_FORCE_DEAUTH_STA);
-	if (!sme_cmd) {
-		sme_cmd = wlan_serialization_get_active_cmd(mac_ctx->psoc,
-					       session_id,
-					       WLAN_SER_CMD_FORCE_DISASSOC_STA);
-		if (!sme_cmd)
-			return ret;
-	}
-
-	if ((mac_ctx->roam.curSubState[session_id] ==
-	     eCSR_ROAM_SUBSTATE_DEAUTH_REQ ||
-	     mac_ctx->roam.curSubState[session_id] ==
-	     eCSR_ROAM_SUBSTATE_DISASSOC_REQ) &&
-	    !qdf_mem_cmp(peer_macaddr.bytes, sme_cmd->u.roamCmd.peerMac,
-			 QDF_MAC_ADDR_SIZE)) {
-		sme_debug("Ignore DEAUTH_IND/DIASSOC_IND as Deauth/Disassoc already in progress");
-		ret = true;
-	}
-
-	return ret;
-}
-
 static void
 csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 {