Osmocom Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 1280

open5gs_2.7.6.4845.f930.202512211800.dsc -> open5gs_2.7.6.4846.4652.202512221800.dsc Changed

@@ -2,7 +2,7 @@
 Source: open5gs
 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.7.6.4845.f930.202512211800
+Version: 2.7.6.4846.4652.202512221800
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- 76d11806db63a1c1431ecf4dc4ea4a903e91b003 15110112 open5gs_2.7.6.4845.f930.202512211800.tar.xz
+ d30abc89efdf4aa21ce3bffe95109d0c94178f49 15109056 open5gs_2.7.6.4846.4652.202512221800.tar.xz
 Checksums-Sha256:
- b07459a56f9bedc0c0ae2f47259807860894094241ef9b93ec8e4b3ee120443f 15110112 open5gs_2.7.6.4845.f930.202512211800.tar.xz
+ 1e616b1c314581f57e448f7d0b88f6f479bf43cf73020b3f1b6f2aaa1ff566c3 15109056 open5gs_2.7.6.4846.4652.202512221800.tar.xz
 Files:
- 7af7d59cb9c3660ddb84ba70f65714db 15110112 open5gs_2.7.6.4845.f930.202512211800.tar.xz
+ f67c26f5a6d70c40fab8f780b10e5d6b 15109056 open5gs_2.7.6.4846.4652.202512221800.tar.xz

open5gs_2.7.6.4845.f930.202512211800.tar.xz/.tarball-version -> open5gs_2.7.6.4846.4652.202512221800.tar.xz/.tarball-version Changed

open5gs_2.7.6.4845.f930.202512211800.tar.xz/debian/changelog -> open5gs_2.7.6.4846.4652.202512221800.tar.xz/debian/changelog Changed

open5gs_2.7.6.4845.f930.202512211800.tar.xz/src/sgwc/s11-handler.c -> open5gs_2.7.6.4846.4652.202512221800.tar.xz/src/sgwc/s11-handler.c Changed

@@ -167,7 +167,7 @@
         sgwc_ue_t *sgwc_ue, ogs_gtp_xact_t *s11_xact,
         ogs_pkbuf_t *gtpbuf, ogs_gtp2_message_t *message)
 {
-    int i;
+    int rv, i;
     uint8_t cause_value = 0;
 
     sgwc_sess_t *sess = NULL;
@@ -200,12 +200,8 @@
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     }
 
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
-        return;
-    }
+    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
+        goto cleanup;
 
     /*****************************************
      * Check Mandatory/Conditional IE Missing
@@ -247,12 +243,8 @@
         cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING;
     }
 
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
-        return;
-    }
+    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
+        goto cleanup;
 
     /* Add Session */
     sess = sgwc_sess_find_by_ebi(sgwc_ue,
@@ -294,21 +286,15 @@
     if (!sess->pfcp_node) {
         ogs_error("%s:%s No SGWU available for session",
                   sgwc_ue->imsi_bcd, sess->session.name);
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
-                OGS_GTP2_CAUSE_SYSTEM_FAILURE);
-        return;
+        cause_value = OGS_GTP2_CAUSE_SYSTEM_FAILURE;
+        goto cleanup;
     }
 
     /* Check if selected SGW-U is associated with SGW-C */
     ogs_assert(sess->pfcp_node);
     if (!OGS_FSM_CHECK(&sess->pfcp_node->sm, sgwc_pfcp_state_associated)) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
-                OGS_GTP2_CAUSE_REMOTE_PEER_NOT_RESPONDING);
-        return;
+        cause_value = OGS_GTP2_CAUSE_REMOTE_PEER_NOT_RESPONDING;
+        goto cleanup;
     }
 
     /* Remove all previous bearer */
@@ -353,17 +339,26 @@
                             s1_u_enodeb_f_teid.data;
             dl_tunnel->remote_teid = be32toh(enb_s1u_teid->teid);
 
-            ogs_assert(OGS_OK ==
-                    ogs_gtp2_f_teid_to_ip(enb_s1u_teid, &dl_tunnel->remote_ip));
+            rv = ogs_gtp2_f_teid_to_ip(enb_s1u_teid, &dl_tunnel->remote_ip);
+            if (rv != OGS_OK) {
+                ogs_error("No IPv4 or IPv6 in eNB-S1U(DL)");
+                cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
+                goto cleanup;
+            }
 
             far = dl_tunnel->far;
             ogs_assert(far);
 
             far->apply_action = OGS_PFCP_APPLY_ACTION_FORW;
 
-            ogs_assert(OGS_OK == ogs_pfcp_ip_to_outer_header_creation(
+            rv = ogs_pfcp_ip_to_outer_header_creation(
                     &dl_tunnel->remote_ip, &far->outer_header_creation,
-                    &far->outer_header_creation_len));
+                    &far->outer_header_creation_len);
+            if (rv != OGS_OK) {
+                ogs_error("No IPv4 or IPv6 in DL-Tunnel");
+                cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
+                goto cleanup;
+            }
             far->outer_header_creation.teid = dl_tunnel->remote_teid;
         }
 
@@ -381,17 +376,26 @@
                             s5_s8_u_sgw_f_teid.data;
             ul_tunnel->remote_teid = be32toh(pgw_s5u_teid->teid);
 
-            ogs_assert(OGS_OK ==
-                    ogs_gtp2_f_teid_to_ip(pgw_s5u_teid, &ul_tunnel->remote_ip));
+            rv = ogs_gtp2_f_teid_to_ip(pgw_s5u_teid, &ul_tunnel->remote_ip);
+            if (rv != OGS_OK) {
+                ogs_error("No IPv4 or IPv6 in PGW-S5U(UL)");
+                cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
+                goto cleanup;
+            }
 
             far = ul_tunnel->far;
             ogs_assert(far);
 
             far->apply_action = OGS_PFCP_APPLY_ACTION_FORW;
 
-            ogs_assert(OGS_OK == ogs_pfcp_ip_to_outer_header_creation(
+            rv = ogs_pfcp_ip_to_outer_header_creation(
                     &ul_tunnel->remote_ip, &far->outer_header_creation,
-                    &far->outer_header_creation_len));
+                    &far->outer_header_creation_len);
+            if (rv != OGS_OK) {
+                ogs_error("No IPv4 or IPv6 in UL-Tunnel");
+                cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
+                goto cleanup;
+            }
             far->outer_header_creation.teid = ul_tunnel->remote_teid;
         }
 
@@ -422,13 +426,25 @@
     ogs_assert(OGS_OK ==
         sgwc_pfcp_send_session_establishment_request(
             sess, s11_xact->id, gtpbuf, 0));
+
+    return;
+
+cleanup:
+    ogs_assert(cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
+    if (sess)
+        sgwc_sess_remove(sess);
+
+    ogs_gtp_send_error_message(
+            s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+            OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
+            cause_value);
 }
 
 void sgwc_s11_handle_modify_bearer_request(
         sgwc_ue_t *sgwc_ue, ogs_gtp_xact_t *s11_xact,
         ogs_pkbuf_t *gtpbuf, ogs_gtp2_message_t *message)
 {
-    int i = 0;
+    int rv, i = 0;
     uint16_t decoded;
     uint8_t cause_value = 0;
 
@@ -465,12 +481,8 @@
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     }
 
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
-        return;
-    }
+    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
+        goto cleanup;
 
     /*****************************************
      * Check Mandatory/Conditional IE Missing
@@ -547,7 +559,12 @@
             req->bearer_contexts_to_be_modifiedi.s1_u_enodeb_f_teid.data;
         dl_tunnel->remote_teid = be32toh(enb_s1u_teid->teid);
 
-        ogs_assert(OGS_OK == ogs_gtp2_f_teid_to_ip(enb_s1u_teid, &remote_ip));
+        rv = ogs_gtp2_f_teid_to_ip(enb_s1u_teid, &remote_ip);
+        if (rv != OGS_OK) {
+            ogs_error("No IPv4 or IPv6 in eNB-S1U(DL)");
+            cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
+            goto cleanup;
+        }
 
         memset(&zero_ip, 0, sizeof(ogs_ip_t));
 
@@ -578,9 +595,13 @@
 
         far->apply_action = OGS_PFCP_APPLY_ACTION_FORW;
 
-        ogs_assert(OGS_OK ==
-            ogs_pfcp_ip_to_outer_header_creation(&dl_tunnel->remote_ip,
-                &far->outer_header_creation, &far->outer_header_creation_len));
+        rv = ogs_pfcp_ip_to_outer_header_creation(&dl_tunnel->remote_ip,
+                &far->outer_header_creation, &far->outer_header_creation_len);
+        if (rv != OGS_OK) {
+            ogs_error("No IPv4 or IPv6 in DL-Tunnel");
+            cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
+            goto cleanup;
+        }
         far->outer_header_creation.teid = dl_tunnel->remote_teid;
 
         ogs_info("    sess_id=%d current_xact=%p flags=0x%llx, bearerEBI=%d",