From 456e6c9207d7003be1d4d57ca4eddc2c51b63862 Mon Sep 17 00:00:00 2001 From: matzakos Date: Tue, 16 Jun 2020 17:40:03 +0200 Subject: [PATCH] Change return type of nr_generate_ulsch_pdu() to avoid overflow on the offset variable --- openair2/LAYER2/NR_MAC_UE/mac_proto.h | 2 +- openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h index 2d49cc0d76..38c9244014 100755 --- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h +++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h @@ -139,7 +139,7 @@ void nr_ue_process_mac_pdu(module_id_t module_idP, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment); -unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload, +uint16_t nr_generate_ulsch_pdu(uint8_t *sdus_payload, uint8_t *pdu, uint8_t num_sdus, uint16_t *sdu_lengths, diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c index 53ef0f62a3..8e4d092591 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c @@ -3723,7 +3723,7 @@ void nr_ue_process_mac_pdu(module_id_t module_idP, /////* ULSCH MAC PDU generation (6.1.2 TS 38.321) *///// //////////////////////////////////////////////////////// -unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload, +uint16_t nr_generate_ulsch_pdu(uint8_t *sdus_payload, uint8_t *pdu, uint8_t num_sdus, uint16_t *sdu_lengths, @@ -3738,7 +3738,8 @@ unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload, NR_MAC_SUBHEADER_FIXED *mac_pdu_ptr = (NR_MAC_SUBHEADER_FIXED *) pdu; unsigned char last_size = 0, i, mac_header_control_elements[16], *ce_ptr, bsr = 0; - int mac_ce_size, offset; + int mac_ce_size; + uint16_t offset = 0; LOG_D(MAC, "[UE] Generating ULSCH PDU : num_sdus %d\n", num_sdus); @@ -3888,7 +3889,7 @@ unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload, // compute final offset offset = ((unsigned char *) mac_pdu_ptr - pdu); - //printf("Offset %d \n", ((unsigned char *) mac_pdu_ptr - mac_pdu)); + //printf("Offset %d \n", ((unsigned char *) mac_pdu_ptr - pdu)); return offset; }