From 9f42fff3efef2aa715c3d8a070f3ddc9106adfc8 Mon Sep 17 00:00:00 2001 From: wanghanlin Date: Sat, 8 May 2021 11:39:53 +0800 Subject: [PATCH] api: fix crash in vl_msg_api_free VPP crash when ASSERT in clib_mem_free. Type: fix Signed-off-by: wanghanlin Change-Id: Id06d833caab3385446528d62a6ed3bde38d57db0 --- src/vlibapi/api_shared.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/vlibapi/api_shared.c b/src/vlibapi/api_shared.c index ec74b5fe357..65288d89f67 100644 --- a/src/vlibapi/api_shared.c +++ b/src/vlibapi/api_shared.c @@ -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... */ 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)) { -- 2.16.6