Skip to content

RRCNR: Fix out-of-bounds RRC Security Mode Command algorithms #1511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jojeker wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RRCNR: Fix out-of-bounds RRC Security Mode Command algorithms #1511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions srsue/src/stack/rrc_nr/rrc_nr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2257,6 +2257,13 @@ void rrc_nr::handle_security_mode_command(const asn1::rrc_nr::security_mode_cmd_
transaction_id = smc.rrc_transaction_id;

const auto& sec_algo_cfg = smc.crit_exts.security_mode_cmd().security_cfg_smc.security_algorithm_cfg;

// Out-of-bounds algorithms
if(sec_algo_cfg.ciphering_algorithm.value >= CIPHERING_ALGORITHM_ID_N_ITEMS
|| sec_algo_cfg.integrity_prot_algorithm.value >= INTEGRITY_ALGORITHM_ID_N_ITEMS){
return;
}

sec_cfg.cipher_algo = (CIPHERING_ALGORITHM_ID_ENUM)sec_algo_cfg.ciphering_algorithm.value;
if (sec_algo_cfg.integrity_prot_algorithm_present) {
sec_cfg.integ_algo = (INTEGRITY_ALGORITHM_ID_ENUM)sec_algo_cfg.integrity_prot_algorithm.value;
Expand Down