PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac_nr: add various safety/length checks

This commit is contained in:
Andre Puschmann 2021-04-09 22:53:24 +02:00
parent b1aaadb51c
commit d1ad315969
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
srsue/src/stack/mac_nr/mac_nr.cc
View File

@ -128,7 +128,8 @@ void mac_nr::update_buffer_states()
mac_buffer_states.lcid_buffer_size[channel.lcid] += buffer_len;
mac_buffer_states.lcg_buffer_size[channel.lcg] += buffer_len;
}
logger.info("%s", mac_buffer_states.to_string());
logger.debug("%s", mac_buffer_states.to_string());
// Count TTI for metrics
for (uint32_t i = 0; i < SRSRAN_MAX_CARRIERS; ++i) {
metrics[i].nof_tti++;
@ -286,11 +287,15 @@ void mac_nr::new_grant_ul(const uint32_t cc_idx, const mac_nr_grant_ul_t& grant,
ul_harq_buffer = mux.get_pdu(grant.tbs);
// fill TB action (goes into UL harq eventually)
action->tb.payload = ul_harq_buffer.get(); // pass handle to PDU to PHY
action->tb.enabled = true;
action->tb.rv = 0;
action->tb.softbuffer = &softbuffer_tx;
srsran_softbuffer_tx_reset(&softbuffer_tx);
if (ul_harq_buffer != nullptr) {
action->tb.payload = ul_harq_buffer.get(); // pass handle to PDU to PHY
action->tb.enabled = true;
action->tb.rv = 0;
action->tb.softbuffer = &softbuffer_tx;
srsran_softbuffer_tx_reset(&softbuffer_tx);
} else {
action->tb.enabled = false;
}
// store PCAP
if (pcap) {

6
srsue/src/stack/mac_nr/mux_nr.cc
View File

@ -49,6 +49,12 @@ srsran::unique_byte_buffer_t mux_nr::get_pdu(uint32_t max_pdu_len)
return nullptr;
}
// verify buffer is large enough for UL grant
if (phy_tx_pdu->get_tailroom() < max_pdu_len) {
logger.error("Can't provide MAC PDU. Grant too big (%d < %d).", phy_tx_pdu->get_tailroom(), max_pdu_len);
return nullptr;
}
logger.debug("Building new MAC PDU (%d B)", max_pdu_len);
tx_pdu.init_tx(phy_tx_pdu.get(), max_pdu_len, true);

6
srsue/src/stack/mac_nr/proc_bsr_nr.cc
View File

@ -199,8 +199,10 @@ bool proc_bsr_nr::check_new_data(const mac_buffer_states_t& new_buffer_state)
srsran::mac_sch_subpdu_nr::lcg_bsr_t proc_bsr_nr::generate_sbsr()
{
srsran::mac_sch_subpdu_nr::lcg_bsr_t sbsr = {};
sbsr.lcg_id = buffer_state.last_non_zero_lcg;
sbsr.buffer_size = buff_size_bytes_to_field(buffer_state.lcg_buffer_size.at(sbsr.lcg_id), SHORT_BSR);
if (buffer_state.nof_lcgs_with_data > 0) {
sbsr.lcg_id = buffer_state.last_non_zero_lcg;
sbsr.buffer_size = buff_size_bytes_to_field(buffer_state.lcg_buffer_size.at(sbsr.lcg_id), SHORT_BSR);
}
triggered_bsr_type = NONE;
return sbsr;
}