ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: fix crash in vl_msg_api_free

Browse Source 
VPP crash when ASSERT in clib_mem_free.

Type: fix

Signed-off-by: wanghanlin <wanghanlin@corp.netease.com>
Change-Id: Id06d833caab3385446528d62a6ed3bde38d57db0
This commit is contained in:
wanghanlin
2021-05-08 11:39:53 +08:00
committed by Florin Coras
parent 27e93a5d76
commit 9f42fff3ef
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vlibapi/api_shared.c
View File

@ -654,7 +654,21 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
* main thread without copying them... * main thread without copying them...
*/ */
if (id >= vec_len (am->message_bounce) || !(am->message_bounce[id])) if (id >= vec_len (am->message_bounce) || !(am->message_bounce[id]))
vl_msg_api_free (the_msg); {
if (is_private)
{
old_vlib_rp = am->vlib_rp;
save_shmem_hdr = am->shmem_hdr;
am->vlib_rp = vlib_rp;
am->shmem_hdr = (void *) vlib_rp->user_ctx;
}
vl_msg_api_free (the_msg);
if (is_private)
{
am->vlib_rp = old_vlib_rp;
am->shmem_hdr = save_shmem_hdr;
}
}
if (PREDICT_FALSE (am->elog_trace_api_messages)) if (PREDICT_FALSE (am->elog_trace_api_messages))
{ {