qcacld-3.0: Strip additional 3 bytes allocated for auth wrapped data

When FILS erp keys are not available, EAP initiate packet will not
be sent to the AP so FILS authentication wrapped data IE is not
required, but the driver is adding extra 3 bytes for wrapped data
even if wrapped data is not included. This will cause issues with
the FILS AP.

Don't allocate bytes for wrapped data if ERP keys are not available.

Change-Id: I9bd8033048829eeaf63ce123129e64f2685df04f
CRs-Fixed: 2732852

core/mac/src/pe/include/lim_process_fils.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -102,8 +102,10 @@ void lim_update_fils_config(struct mac_context *mac_ctx,
  *
  * Return: length of fils data
  */
-uint32_t lim_create_fils_auth_data(struct mac_context *mac_ctx,
-		tpSirMacAuthFrameBody auth_frame, struct pe_session *session);
+QDF_STATUS lim_create_fils_auth_data(struct mac_context *mac_ctx,
+				     tpSirMacAuthFrameBody auth_frame,
+				     struct pe_session *session,
+				     uint32_t *frame_len);
 
 /**
  * lim_increase_fils_sequence_number: this API increases fils sequence number in
@@ -256,10 +258,13 @@ void lim_update_fils_config(struct mac_context *mac_ctx,
 			    struct join_req *sme_join_req)
 { }
 
-static inline uint32_t lim_create_fils_auth_data(struct mac_context *mac_ctx,
-		tpSirMacAuthFrameBody auth_frame, struct pe_session *session)
+static inline
+QDF_STATUS lim_create_fils_auth_data(struct mac_context *mac_ctx,
+				     tpSirMacAuthFrameBody auth_frame,
+				     struct pe_session *session,
+				     uint32_t *frame_len);
 {
-	return 0;
+	return QDF_STATUS_SUCCESS;
 }
 
 static inline bool lim_is_fils_connection(struct pe_session *pe_session)

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

@@ -1614,41 +1614,49 @@ void lim_update_fils_config(struct mac_context *mac_ctx,
  *
  * Return: length of fils data
  */
-uint32_t lim_create_fils_auth_data(struct mac_context *mac_ctx,
-		tpSirMacAuthFrameBody auth_frame,
-		struct pe_session *session)
+QDF_STATUS lim_create_fils_auth_data(struct mac_context *mac_ctx,
+				     tpSirMacAuthFrameBody auth_frame,
+				     struct pe_session *session,
+				     uint32_t *frame_len)
 {
-	uint32_t frame_len = 0;
+	uint16_t frm_len = 0;
 	int32_t wrapped_data_len;
 
 	if (!session->fils_info)
-		return 0;
+		return QDF_STATUS_SUCCESS;
 
 	/* These memory may already been allocated if auth retry */
 	if (session->fils_info->fils_rik) {
 		qdf_mem_free(session->fils_info->fils_rik);
 		session->fils_info->fils_rik = NULL;
 	}
+
 	if  (session->fils_info->fils_erp_reauth_pkt) {
 		qdf_mem_free(session->fils_info->fils_erp_reauth_pkt);
 		session->fils_info->fils_erp_reauth_pkt = NULL;
 	}
+
 	if (auth_frame->authAlgoNumber == SIR_FILS_SK_WITHOUT_PFS) {
-		frame_len += session->fils_info->rsn_ie_len;
+		frm_len += session->fils_info->rsn_ie_len;
 		/* FILS nounce */
-		frame_len += SIR_FILS_NONCE_LENGTH + EXTENDED_IE_HEADER_LEN;
+		frm_len += SIR_FILS_NONCE_LENGTH + EXTENDED_IE_HEADER_LEN;
 		/* FILS Session */
-		frame_len += SIR_FILS_SESSION_LENGTH + EXTENDED_IE_HEADER_LEN;
+		frm_len += SIR_FILS_SESSION_LENGTH + EXTENDED_IE_HEADER_LEN;
 		/* Calculate data/length for FILS Wrapped Data */
 		wrapped_data_len =
 			lim_create_fils_wrapper_data(session->fils_info);
 		if (wrapped_data_len < 0) {
-			pe_err("failed to create warpped data");
-			return 0;
+			pe_err("failed to allocate wrapped data");
+			return QDF_STATUS_E_FAILURE;
 		}
-		frame_len += wrapped_data_len + EXTENDED_IE_HEADER_LEN;
+
+		if (wrapped_data_len)
+			frm_len += wrapped_data_len + EXTENDED_IE_HEADER_LEN;
 	}
-	return frame_len;
+
+	*frame_len += frm_len;
+
+	return QDF_STATUS_SUCCESS;
 }
 
 void populate_fils_connect_params(struct mac_context *mac_ctx,

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

@@ -2645,7 +2645,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
 	uint32_t frame_len = 0, body_len = 0;
 	tpSirMacMgmtHdr mac_hdr;
 	void *packet;
-	QDF_STATUS qdf_status;
+	QDF_STATUS qdf_status, status;
 	uint8_t tx_flag = 0;
 	uint8_t vdev_id = 0;
 	uint16_t ft_ies_length = 0;
@@ -2688,8 +2688,11 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
 		body_len = SIR_MAC_AUTH_FRAME_INFO_LEN;
 		frame_len = sizeof(tSirMacMgmtHdr) + body_len;
 
-		frame_len += lim_create_fils_auth_data(mac_ctx,
-						auth_frame, session);
+		status = lim_create_fils_auth_data(mac_ctx, auth_frame,
+						   session, &frame_len);
+		if (QDF_IS_STATUS_ERROR(status))
+			return;
+
 		if (auth_frame->authAlgoNumber == eSIR_FT_AUTH) {
 			if (session->ftPEContext.pFTPreAuthReq &&
 			    0 != session->ftPEContext.pFTPreAuthReq->