From d27d19333957e57ea2a0c2573d944f43a7485244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BAben=20Soares=20da=20Silva?= Date: Fri, 24 May 2024 14:36:42 +0100 Subject: [PATCH] Fix P5 messages memory leaks ( CONFIG.request / CONFIG.response ) --- nfapi/oai_integration/aerial/fapi_vnf_p5.c | 4 +--- nfapi/open-nFAPI/vnf/src/vnf.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p5.c b/nfapi/oai_integration/aerial/fapi_vnf_p5.c index 155d89f81f..e3af58537f 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p5.c +++ b/nfapi/oai_integration/aerial/fapi_vnf_p5.c @@ -351,12 +351,10 @@ int aerial_nr_send_config_request(nfapi_vnf_config_t *config, int p5_idx) nfapi_p4_p5_message_header_t *msg = &req->header; uint16_t msg_len = sizeof(nfapi_nr_config_request_scf_t); - nfapi_p4_p5_message_header_t *msgFAPI = calloc(1, msg_len); - memcpy(msgFAPI, &req->header, msg_len); uint8_t tx_messagebufferFAPI[sizeof(_this->tx_message_buffer)]; int packedMessageLengthFAPI = -1; packedMessageLengthFAPI = - fapi_nr_p5_message_pack(msgFAPI, msg_len, tx_messagebufferFAPI, sizeof(tx_messagebufferFAPI), &_this->_public.codec_config); + fapi_nr_p5_message_pack(msg, msg_len, tx_messagebufferFAPI, sizeof(tx_messagebufferFAPI), &_this->_public.codec_config); aerial_send_P5_msg(tx_messagebufferFAPI, packedMessageLengthFAPI, msg); diff --git a/nfapi/open-nFAPI/vnf/src/vnf.c b/nfapi/open-nFAPI/vnf/src/vnf.c index 44683d752a..6a769acd77 100644 --- a/nfapi/open-nFAPI/vnf/src/vnf.c +++ b/nfapi/open-nFAPI/vnf/src/vnf.c @@ -1529,13 +1529,11 @@ int vnf_nr_pack_and_send_p5_message(vnf_t* vnf, uint16_t p5_idx, nfapi_p4_p5_mes #ifdef ENABLE_AERIAL // In case it is a FAPI message, create 2 messages, one with nFAPI header for OAI PNF and one with no nFAPI header for Aerial // L1 - nfapi_p4_p5_message_header_t *msgFAPI = calloc(1, msg_len); - memcpy(msgFAPI, msg, msg_len); // create FAPI tx_buffer uint8_t tx_messagebufferFAPI[sizeof(vnf->tx_message_buffer)]; int packedMessageLengthFAPI = -1; packedMessageLengthFAPI = - fapi_nr_p5_message_pack(msgFAPI, msg_len, tx_messagebufferFAPI, sizeof(tx_messagebufferFAPI), &vnf->_public.codec_config); + fapi_nr_p5_message_pack(msg, msg_len, tx_messagebufferFAPI, sizeof(tx_messagebufferFAPI), &vnf->_public.codec_config); return aerial_send_P5_msg(tx_messagebufferFAPI, packedMessageLengthFAPI, msg); #else return 0;