maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nr_psbchsim: fix segv by providing correct get_nrUE_params()

Browse Source 
When running, nr_psbchsim, we get this UBsan error:

    openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c:79:16: runtime error: member access within misaligned address 0x0ff4278c791c for type 'struct nrUE_params_t', which requires 8 byte alignment

The problem is that the corresponding definition of
get_nrUE_params() in psbchsim.c does not actually return the UE params,
but void, so we might or might not get something that resembles valid
data in nr_adjust_synch_ue.c. Fix this by including nr-uesoftmodem.h
(that provides the correct declaration) and define it correctly. Due to
type mismatches, also adapt downlink_frequency, uplink_frequency_offset,
and openair_cfg (which might result in the same type of bugs).
This commit is contained in:
Robert Schmidt
2024-10-21 11:04:43 +02:00
parent dd7c3f80e8
commit 44616a6a19
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/NR_PHY/psbchsim.c
+9 -5
View File
@@ -25,6 +25,7 @@
#include "common/utils/load_module_shlib.h" #include "common/utils/load_module_shlib.h"
#include "PHY/MODULATION/nr_modulation.h" #include "PHY/MODULATION/nr_modulation.h"
#include "NR_SL-SSB-TimeAllocation-r16.h" #include "NR_SL-SSB-TimeAllocation-r16.h"
#include "nr-uesoftmodem.h"
void e1_bearer_context_setup(const e1ap_bearer_setup_req_t *req) void e1_bearer_context_setup(const e1ap_bearer_setup_req_t *req)
{ {
@@ -54,12 +55,13 @@ double cpuf;
void get_num_re_dmrs(nfapi_nr_ue_pusch_pdu_t *pusch_pdu, uint8_t *nb_dmrs_re_per_rb, uint16_t *number_dmrs_symbols) void get_num_re_dmrs(nfapi_nr_ue_pusch_pdu_t *pusch_pdu, uint8_t *nb_dmrs_re_per_rb, uint16_t *number_dmrs_symbols)
{ {
} }
uint64_t downlink_frequency[1][1];
int32_t uplink_frequency_offset[1][1]; uint64_t downlink_frequency[MAX_NUM_CCs][4];
int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
THREAD_STRUCT thread_struct; THREAD_STRUCT thread_struct;
instance_t DUuniqInstance = 0; instance_t DUuniqInstance = 0;
instance_t CUuniqInstance = 0; instance_t CUuniqInstance = 0;
openair0_config_t openair0_cfg[1]; openair0_config_t openair0_cfg[MAX_CARDS];
RAN_CONTEXT_t RC; RAN_CONTEXT_t RC;
int oai_exit = 0; int oai_exit = 0;
@@ -80,9 +82,11 @@ int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
return 0; return 0;
} }
void get_nrUE_params(void) nrUE_params_t nrUE_params = {0};
nrUE_params_t *get_nrUE_params(void)
{ {
return; return &nrUE_params;
} }
uint8_t check_if_ue_is_sl_syncsource() uint8_t check_if_ue_is_sl_syncsource()
{ {