5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix potential out-of-bounds access in static look-up-tables

Browse Source 
check index before accessing lut
master
Andre Puschmann 5 years ago
parent 52799192ab
commit ba4c2f10f0
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File

21
lib/src/phy/common/phy_common_sl.c
Unescape Escape View File

@ -164,11 +164,12 @@ static const srslte_sl_symbol_t srslte_psbch_symbol_map_tm34[SRSLTE_CP_NORM_SF_N
bool srslte_psbch_is_symbol(srslte_sl_symbol_t type, srslte_sl_tm_t tm, uint32_t i, srslte_cp_t cp) bool srslte_psbch_is_symbol(srslte_sl_symbol_t type, srslte_sl_tm_t tm, uint32_t i, srslte_cp_t cp)
{ {
if (tm == SRSLTE_SIDELINK_TM1 || tm == SRSLTE_SIDELINK_TM2) { if (tm == SRSLTE_SIDELINK_TM1 || tm == SRSLTE_SIDELINK_TM2) {
if (cp == SRSLTE_CP_EXT) { if (cp == SRSLTE_CP_EXT && i < SRSLTE_CP_EXT_SF_NSYMB) {
return srslte_psbch_symbol_map_tm12_ext[i] == type; return srslte_psbch_symbol_map_tm12_ext[i] == type;
} } else if (i < SRSLTE_CP_NORM_SF_NSYMB) {
return srslte_psbch_symbol_map_tm12[i] == type; return srslte_psbch_symbol_map_tm12[i] == type;
} else if (tm == SRSLTE_SIDELINK_TM3 || tm == SRSLTE_SIDELINK_TM4) { }
} else if ((tm == SRSLTE_SIDELINK_TM3 || tm == SRSLTE_SIDELINK_TM4) && i < SRSLTE_CP_NORM_SF_NSYMB) {
return srslte_psbch_symbol_map_tm34[i] == type; return srslte_psbch_symbol_map_tm34[i] == type;
} }
return false; return false;
@ -221,11 +222,12 @@ static const srslte_sl_symbol_t srslte_pscch_symbol_map_tm34[SRSLTE_CP_NORM_SF_N
bool srslte_pscch_is_symbol(srslte_sl_symbol_t type, srslte_sl_tm_t tm, uint32_t i, srslte_cp_t cp) bool srslte_pscch_is_symbol(srslte_sl_symbol_t type, srslte_sl_tm_t tm, uint32_t i, srslte_cp_t cp)
{ {
if (tm == SRSLTE_SIDELINK_TM1 || tm == SRSLTE_SIDELINK_TM2) { if (tm == SRSLTE_SIDELINK_TM1 || tm == SRSLTE_SIDELINK_TM2) {
if (cp == SRSLTE_CP_EXT) { if (cp == SRSLTE_CP_EXT && i < SRSLTE_CP_EXT_SF_NSYMB) {
return srslte_pscch_symbol_map_tm12_ext[i] == type; return srslte_pscch_symbol_map_tm12_ext[i] == type;
} } else if (i < SRSLTE_CP_NORM_SF_NSYMB) {
return srslte_pscch_symbol_map_tm12[i] == type; return srslte_pscch_symbol_map_tm12[i] == type;
} else if (tm == SRSLTE_SIDELINK_TM3 || tm == SRSLTE_SIDELINK_TM4) { }
} else if ((tm == SRSLTE_SIDELINK_TM3 || tm == SRSLTE_SIDELINK_TM4) && i < SRSLTE_CP_NORM_SF_NSYMB) {
return srslte_pscch_symbol_map_tm34[i] == type; return srslte_pscch_symbol_map_tm34[i] == type;
} }
return false; return false;
@ -278,11 +280,12 @@ static const srslte_sl_symbol_t srslte_pssch_symbol_map_tm34[SRSLTE_CP_NORM_SF_N
bool srslte_pssch_is_symbol(srslte_sl_symbol_t type, srslte_sl_tm_t tm, uint32_t i, srslte_cp_t cp) bool srslte_pssch_is_symbol(srslte_sl_symbol_t type, srslte_sl_tm_t tm, uint32_t i, srslte_cp_t cp)
{ {
if (tm == SRSLTE_SIDELINK_TM1 || tm == SRSLTE_SIDELINK_TM2) { if (tm == SRSLTE_SIDELINK_TM1 || tm == SRSLTE_SIDELINK_TM2) {
if (cp == SRSLTE_CP_EXT) { if (cp == SRSLTE_CP_EXT && i < SRSLTE_CP_EXT_SF_NSYMB) {
return srslte_pssch_symbol_map_tm12_ext[i] == type; return srslte_pssch_symbol_map_tm12_ext[i] == type;
} } else if (i < SRSLTE_CP_NORM_SF_NSYMB) {
return srslte_pssch_symbol_map_tm12[i] == type; return srslte_pssch_symbol_map_tm12[i] == type;
} else if (tm == SRSLTE_SIDELINK_TM3 || tm == SRSLTE_SIDELINK_TM4) { }
} else if ((tm == SRSLTE_SIDELINK_TM3 || tm == SRSLTE_SIDELINK_TM4) && i < SRSLTE_CP_NORM_SF_NSYMB) {
return srslte_pssch_symbol_map_tm34[i] == type; return srslte_pssch_symbol_map_tm34[i] == type;
} }
return false; return false;

Write Preview
Loading…
Cancel
Save