cu_cp,rrc: Reject reestablishment after failed reconfiguration

FabianEckermann · codebot · commit 35688dc343b0 · 2023-11-08T07:43:49.000Z
diff --git a/lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp b/lib/rrc/ue/procedures/rrc_reestablishment_procedure.cpp
@@ -171,7 +171,12 @@ bool rrc_reestablishment_procedure::get_and_verify_reestablishment_context()
 
 bool rrc_reestablishment_procedure::is_reestablishment_rejected()
 {
-  return context.cfg.force_reestablishment_fallback or !get_and_verify_reestablishment_context();
+  return context.cfg.force_reestablishment_fallback or /* reject because of configuration */
+         reestablishment_request.rrc_reest_request.reest_cause.value ==
+             asn1::rrc_nr::reest_cause_opts::recfg_fail or /* reject because we can't recover if a reconfiguration
+                                                              failed */
+         !get_and_verify_reestablishment_context(); /* reject when reestablishment context is missing or verification
+                                                       fails */
 }
 
 bool rrc_reestablishment_procedure::verify_security_context()

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,12 @@ bool rrc_reestablishment_procedure::get_and_verify_reestablishment_context()`
`171`	`171`
`172`	`172`	`bool rrc_reestablishment_procedure::is_reestablishment_rejected()`
`173`	`173`	`{`
`174`		`- return context.cfg.force_reestablishment_fallback or !get_and_verify_reestablishment_context();`
	`174`	`+ return context.cfg.force_reestablishment_fallback or /* reject because of configuration */`
	`175`	`+ reestablishment_request.rrc_reest_request.reest_cause.value ==`
	`176`	`+ asn1::rrc_nr::reest_cause_opts::recfg_fail or /* reject because we can't recover if a reconfiguration`
	`177`	`+ failed */`
	`178`	`+ !get_and_verify_reestablishment_context(); /* reject when reestablishment context is missing or verification`
	`179`	`+ fails */`
`175`	`180`	`}`
`176`	`181`
`177`	`182`	`bool rrc_reestablishment_procedure::verify_security_context()`