qcacld-3.0: Pass correct data length in oem data response msg
Add data length information in oem data response messages. Currently
maximum response size is passed to upper layers.
Change-Id: Id74d44e03755af9a5402e5409ee5f6b5e7abbb7c
CRs-Fixed: 942260
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 07c8545..53f06fe 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -1253,11 +1253,12 @@
return -EINVAL;
}
- /* wma puts 4 bytes prefix for msg subtype, so length
+ /*
+ * wma puts 4 bytes prefix for msg subtype, so length
* of data received from target should be 4 bytes less
* then max allowed
*/
- if (datalen > (OEM_DATA_RSP_SIZE - 4)) {
+ if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) {
WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)",
__func__, datalen, (OEM_DATA_RSP_SIZE - 4));
return -EINVAL;
@@ -1268,15 +1269,23 @@
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
}
+ pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN;
+ pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen);
+ if (!pStartOemDataRsp->oem_data_rsp) {
+ WMA_LOGE(FL("malloc failed for oem_data_rsp"));
+ qdf_mem_free(pStartOemDataRsp);
+ return -ENOMEM;
+ }
- qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp));
pStartOemDataRsp->target_rsp = true;
- msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]);
+ msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp;
*msg_subtype = WMI_OEM_CAPABILITY_RSP;
- qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen);
+ /* copy data after msg sub type */
+ qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN,
+ data, datalen);
WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)",
- __func__, datalen);
+ __func__, pStartOemDataRsp->rsp_len);
wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)pStartOemDataRsp, 0);
return 0;
@@ -1315,11 +1324,12 @@
return -EINVAL;
}
- /* wma puts 4 bytes prefix for msg subtype, so length
+ /*
+ * wma puts 4 bytes prefix for msg subtype, so length
* of data received from target should be 4 bytes less
* then max allowed
*/
- if (datalen > (OEM_DATA_RSP_SIZE - 4)) {
+ if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) {
WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)",
__func__, datalen, (OEM_DATA_RSP_SIZE - 4));
return -EINVAL;
@@ -1330,12 +1340,20 @@
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
}
+ pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN;
+ pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen);
+ if (!pStartOemDataRsp->oem_data_rsp) {
+ WMA_LOGE(FL("malloc failed for oem_data_rsp"));
+ qdf_mem_free(pStartOemDataRsp);
+ return -ENOMEM;
+ }
- qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp));
pStartOemDataRsp->target_rsp = true;
- msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]);
+ msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp;
*msg_subtype = WMI_OEM_MEASUREMENT_RSP;
- qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen);
+ /* copy data after msg sub type */
+ qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN,
+ data, pStartOemDataRsp->rsp_len);
WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)",
__func__, datalen);
@@ -1376,11 +1394,12 @@
return -EINVAL;
}
- /* wma puts 4 bytes prefix for msg subtype, so length
+ /*
+ * wma puts 4 bytes prefix for msg subtype, so length
* of data received from target should be 4 bytes less
* then max allowed
*/
- if (datalen > (OEM_DATA_RSP_SIZE - 4)) {
+ if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) {
WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)",
__func__, datalen, (OEM_DATA_RSP_SIZE - 4));
return -EINVAL;
@@ -1391,12 +1410,20 @@
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
}
+ pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN;
+ pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen);
+ if (!pStartOemDataRsp->oem_data_rsp) {
+ WMA_LOGE(FL("malloc failed for oem_data_rsp"));
+ qdf_mem_free(pStartOemDataRsp);
+ return -ENOMEM;
+ }
- qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp));
pStartOemDataRsp->target_rsp = true;
- msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]);
+ msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp;
*msg_subtype = WMI_OEM_ERROR_REPORT_RSP;
- qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen);
+ /* copy data after msg sub type */
+ qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN,
+ data, pStartOemDataRsp->rsp_len);
WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)",
__func__, datalen);
@@ -1420,7 +1447,7 @@
WMI_OEM_RESPONSE_EVENTID_param_tlvs *param_buf;
uint8_t *data;
uint32_t datalen;
- tStartOemDataRsp *oem_data_rsp;
+ tStartOemDataRsp *oem_rsp;
param_buf = (WMI_OEM_RESPONSE_EVENTID_param_tlvs *) datap;
if (!param_buf) {
@@ -1442,19 +1469,25 @@
return -EINVAL;
}
- oem_data_rsp = qdf_mem_malloc(sizeof(*oem_data_rsp));
- if (!oem_data_rsp) {
+ oem_rsp = qdf_mem_malloc(sizeof(*oem_rsp));
+ if (!oem_rsp) {
WMA_LOGE(FL("Failed to alloc oem_data_rsp"));
return -ENOMEM;
}
+ oem_rsp->rsp_len = datalen;
+ oem_rsp->oem_data_rsp = qdf_mem_malloc(datalen);
+ if (!oem_rsp->rsp_len) {
+ WMA_LOGE(FL("malloc failed for oem_data_rsp"));
+ qdf_mem_free(oem_rsp);
+ return -ENOMEM;
+ }
- qdf_mem_zero(oem_data_rsp, sizeof(tStartOemDataRsp));
- oem_data_rsp->target_rsp = true;
- qdf_mem_copy(&oem_data_rsp->oemDataRsp[0], data, datalen);
+ oem_rsp->target_rsp = true;
+ qdf_mem_copy(oem_rsp->oem_data_rsp, data, datalen);
WMA_LOGI(FL("Sending WMA_START_OEM_DATA_RSP, data len %d"), datalen);
- wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)oem_data_rsp, 0);
+ wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)oem_rsp, 0);
return 0;
}