From 879466e0cbf31a3b1a4814fe4262e678618da2ac Mon Sep 17 00:00:00 2001 From: tgotic Date: Mon, 8 Aug 2022 16:18:16 +0200 Subject: [PATCH 1/2] local copy of btc_msg_t No need to use local copy of btc_msg_t in btc_transfer_context, create it on heap and pass to osi_thread_post(). --- components/bt/common/btc/core/btc_task.c | 47 +++++++++++------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/components/bt/common/btc/core/btc_task.c b/components/bt/common/btc/core/btc_task.c index 2432467c3d..31a1d009e5 100644 --- a/components/bt/common/btc/core/btc_task.c +++ b/components/bt/common/btc/core/btc_task.c @@ -214,16 +214,7 @@ static void btc_thread_handler(void *arg) static bt_status_t btc_task_post(btc_msg_t *msg, uint32_t timeout) { - btc_msg_t *lmsg; - - lmsg = (btc_msg_t *)osi_malloc(sizeof(btc_msg_t)); - if (lmsg == NULL) { - return BT_STATUS_NOMEM; - } - - memcpy(lmsg, msg, sizeof(btc_msg_t)); - - if (osi_thread_post(btc_thread, btc_thread_handler, lmsg, 0, timeout) == false) { + if (osi_thread_post(btc_thread, btc_thread_handler, msg, 0, timeout) == false) { return BT_STATUS_BUSY; } @@ -241,7 +232,7 @@ static bt_status_t btc_task_post(btc_msg_t *msg, uint32_t timeout) */ bt_status_t btc_transfer_context(btc_msg_t *msg, void *arg, int arg_len, btc_arg_deep_copy_t copy_func) { - btc_msg_t lmsg; + btc_msg_t* lmsg; if (msg == NULL) { return BT_STATUS_PARM_INVALID; @@ -249,22 +240,28 @@ bt_status_t btc_transfer_context(btc_msg_t *msg, void *arg, int arg_len, btc_arg BTC_TRACE_DEBUG("%s msg %u %u %u %p\n", __func__, msg->sig, msg->pid, msg->act, arg); - memcpy(&lmsg, msg, sizeof(btc_msg_t)); - if (arg) { - lmsg.arg = (void *)osi_malloc(arg_len); - if (lmsg.arg == NULL) { - return BT_STATUS_NOMEM; - } - memset(lmsg.arg, 0x00, arg_len); //important, avoid arg which have no length - memcpy(lmsg.arg, arg, arg_len); - if (copy_func) { - copy_func(&lmsg, lmsg.arg, arg); - } - } else { - lmsg.arg = NULL; + lmsg = (btc_msg_t *)osi_malloc(sizeof(btc_msg_t)); + if (lmsg == NULL) { + return BT_STATUS_NOMEM; } - return btc_task_post(&lmsg, OSI_THREAD_MAX_TIMEOUT); + memcpy(lmsg, msg, sizeof(btc_msg_t)); + if (arg) { + lmsg->arg = (void *)osi_malloc(arg_len); + if (lmsg->arg == NULL) { + free(lmsg); + return BT_STATUS_NOMEM; + } + memset(lmsg->arg, 0x00, arg_len); //important, avoid arg which have no length + memcpy(lmsg->arg, arg, arg_len); + if (copy_func) { + copy_func(lmsg, lmsg->arg, arg); + } + } else { + lmsg->arg = NULL; + } + + return btc_task_post(lmsg, OSI_THREAD_MAX_TIMEOUT); } From 810667fc1e03df8250b93c4036a98377a4ca999c Mon Sep 17 00:00:00 2001 From: tgotic Date: Thu, 11 Aug 2022 18:14:35 +0200 Subject: [PATCH 2/2] update code to use osi_free() --- components/bt/common/btc/core/btc_task.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/bt/common/btc/core/btc_task.c b/components/bt/common/btc/core/btc_task.c index 31a1d009e5..9e2de576c0 100644 --- a/components/bt/common/btc/core/btc_task.c +++ b/components/bt/common/btc/core/btc_task.c @@ -234,7 +234,8 @@ bt_status_t btc_transfer_context(btc_msg_t *msg, void *arg, int arg_len, btc_arg { btc_msg_t* lmsg; - if (msg == NULL) { + // arg XOR arg_len + if ((msg == NULL) || ((arg == NULL) == !(arg_len == 0))) { return BT_STATUS_PARM_INVALID; } @@ -249,7 +250,7 @@ bt_status_t btc_transfer_context(btc_msg_t *msg, void *arg, int arg_len, btc_arg if (arg) { lmsg->arg = (void *)osi_malloc(arg_len); if (lmsg->arg == NULL) { - free(lmsg); + osi_free(lmsg); return BT_STATUS_NOMEM; } memset(lmsg->arg, 0x00, arg_len); //important, avoid arg which have no length