Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
b5e39020
Commit
b5e39020
authored
Oct 31, 2023
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
temporary workaround to avoid heap-use-after-free
parent
7accacef
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
24 deletions
+15
-24
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+5
-7
openair2/LAYER2/NR_MAC_UE/mac_defs.h
openair2/LAYER2/NR_MAC_UE/mac_defs.h
+0
-1
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+10
-16
No files found.
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
b5e39020
...
...
@@ -732,23 +732,22 @@ void nr_rrc_mac_config_req_reset(module_id_t module_id,
reset_mac_inst
(
mac
);
reset_ra
(
&
mac
->
ra
);
release_mac_configuration
(
mac
);
for
(
int
i
=
0
;
i
<
NR_MAX_NUM_LCID
;
i
++
)
mac
->
active_RLC_bearer
[
i
]
=
false
;
mac
->
first_sync_frame
=
-
1
;
mac
->
get_sib1
=
false
;
mac
->
phy_config_request_sent
=
false
;
mac
->
state
=
UE_NOT_SYNC
;
release_mac_configuration
(
mac
);
for
(
int
i
=
0
;
i
<
NR_MAX_NUM_LCID
;
i
++
)
mac
->
active_RLC_bearer
[
i
]
=
false
;
// Sending to PHY a request to resync
// with no target cell ID
mac
->
synch_request
.
Mod_id
=
module_id
;
mac
->
synch_request
.
CC_id
=
0
;
mac
->
synch_request
.
synch_req
.
target_Nid_cell
=
-
1
;
mac
->
if_module
->
synch_request
(
&
mac
->
synch_request
);
}
void
nr_rrc_mac_config_req_sib1
(
module_id_t
module_id
,
...
...
@@ -828,7 +827,6 @@ void nr_rrc_mac_config_req_cg(module_id_t module_id,
LOG_I
(
MAC
,
"Applying CellGroupConfig from gNodeB
\n
"
);
AssertFatal
(
cell_group_config
,
"CellGroupConfig should not be NULL
\n
"
);
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
mac
->
cg
=
cell_group_config
;
if
(
cell_group_config
->
mac_CellGroupConfig
)
{
// TODO handle MAC-CellGroupConfig
...
...
openair2/LAYER2/NR_MAC_UE/mac_defs.h
View file @
b5e39020
...
...
@@ -425,7 +425,6 @@ typedef struct ssb_list_info {
/*!\brief Top level UE MAC structure */
typedef
struct
{
NR_UE_L2_STATE_t
state
;
NR_CellGroupConfig_t
*
cg
;
int
servCellIndex
;
long
physCellId
;
//// MAC config
...
...
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
View file @
b5e39020
...
...
@@ -189,26 +189,20 @@ void reset_mac_inst(NR_UE_MAC_INST_t *nr_mac)
void
release_mac_configuration
(
NR_UE_MAC_INST_t
*
mac
)
{
if
(
mac
->
cg
)
{
ASN_STRUCT_FREE
(
asn_DEF_NR_CellGroupConfig
,
mac
->
cg
);
mac
->
cg
=
NULL
;
}
if
(
mac
->
mib
)
{
ASN_STRUCT_FREE
(
asn_DEF_NR_MIB
,
mac
->
mib
);
mac
->
mib
=
NULL
;
}
// TODO properly freeing structures
// once separation between MAC and RRC is complete
mac
->
bwp_dlcommon
=
NULL
;
mac
->
bwp_ulcommon
=
NULL
;
if
(
mac
->
search_space_zero
)
{
ASN_STRUCT_FREE
(
asn_DEF_NR_SearchSpace
,
mac
->
search_space_zero
);
mac
->
search_space_zero
=
NULL
;
}
if
(
mac
->
ra_SS
)
{
ASN_STRUCT_FREE
(
asn_DEF_NR_SearchSpace
,
mac
->
ra_SS
);
mac
->
ra_SS
=
NULL
;
}
if
(
mac
->
otherSI_SS
)
{
ASN_STRUCT_FREE
(
asn_DEF_NR_SearchSpace
,
mac
->
otherSI_SS
);
mac
->
otherSI_SS
=
NULL
;
}
if
(
mac
->
coreset0
)
{
ASN_STRUCT_FREE
(
asn_DEF_NR_ControlResourceSet
,
mac
->
coreset0
);
mac
->
coreset0
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment