|
@@ -3525,31 +3525,43 @@ int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap,
|
|
|
WMI_DEBUG_PRINT_EVENTID_param_tlvs *param_buf;
|
|
|
uint8_t *data;
|
|
|
uint32_t datalen;
|
|
|
+ char dbgbuf[WMI_SVC_MSG_MAX_SIZE] = { 0 };
|
|
|
|
|
|
param_buf = (WMI_DEBUG_PRINT_EVENTID_param_tlvs *) datap;
|
|
|
- if (!param_buf) {
|
|
|
+ if (!param_buf || !param_buf->data) {
|
|
|
WMA_LOGE("Get NULL point message from FW");
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
data = param_buf->data;
|
|
|
datalen = param_buf->num_data;
|
|
|
+ if (datalen > WMI_SVC_MSG_MAX_SIZE) {
|
|
|
+ WMA_LOGE("Received data len %d exceeds max value %d",
|
|
|
+ datalen, WMI_SVC_MSG_MAX_SIZE);
|
|
|
+ return QDF_STATUS_E_FAILURE;
|
|
|
+ }
|
|
|
|
|
|
#ifdef BIG_ENDIAN_HOST
|
|
|
{
|
|
|
- if (datalen > BIG_ENDIAN_MAX_DEBUG_BUF) {
|
|
|
+ if (datalen >= BIG_ENDIAN_MAX_DEBUG_BUF) {
|
|
|
WMA_LOGE("%s Invalid data len %d, limiting to max",
|
|
|
__func__, datalen);
|
|
|
- datalen = BIG_ENDIAN_MAX_DEBUG_BUF;
|
|
|
+ datalen = BIG_ENDIAN_MAX_DEBUG_BUF-1;
|
|
|
}
|
|
|
- char dbgbuf[BIG_ENDIAN_MAX_DEBUG_BUF] = { 0 };
|
|
|
|
|
|
- memcpy(dbgbuf, data, datalen);
|
|
|
+ strlcpy(dbgbuf, data, datalen);
|
|
|
SWAPME(dbgbuf, datalen);
|
|
|
WMA_LOGD("FIRMWARE:%s", dbgbuf);
|
|
|
return 0;
|
|
|
}
|
|
|
#else
|
|
|
- WMA_LOGD("FIRMWARE:%s", data);
|
|
|
+ if (datalen == WMI_SVC_MSG_MAX_SIZE) {
|
|
|
+ WMA_LOGE("%s Invalid data len %d, limiting to max",
|
|
|
+ __func__, datalen);
|
|
|
+ datalen = WMI_SVC_MSG_MAX_SIZE -1 ;
|
|
|
+ }
|
|
|
+
|
|
|
+ strlcpy(dbgbuf, data, datalen);
|
|
|
+ WMA_LOGD("FIRMWARE:%s", dbgbuf);
|
|
|
return 0;
|
|
|
#endif /* BIG_ENDIAN_HOST */
|
|
|
}
|