Osmocom Open Build Service

open5gs_2.7.0.140.cd76d.202404122026.dsc Deleted

@@ -1,39 +0,0 @@
-Format: 3.0 (native)
-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.0.140.cd76d.202404122026
-Maintainer: Harald Welte <laforge@gnumonks.org>
-Uploaders: Sukchan Lee <acetcom@gmail.com>
-Homepage: https://open5gs.org
-Standards-Version: 4.3.0
-Vcs-Browser: https://github.com/open5gs/open5gs
-Vcs-Git: git://github.com/open5gs/open5gs
-Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
-Package-List:
- open5gs deb net optional arch=any
- open5gs-amf deb net optional arch=any
- open5gs-ausf deb net optional arch=any
- open5gs-bsf deb net optional arch=any
- open5gs-common deb net optional arch=any
- open5gs-dbg deb net optional arch=any
- open5gs-hss deb net optional arch=any
- open5gs-mme deb net optional arch=any
- open5gs-nrf deb net optional arch=any
- open5gs-nssf deb net optional arch=any
- open5gs-pcf deb net optional arch=any
- open5gs-pcrf deb net optional arch=any
- open5gs-scp deb net optional arch=any
- open5gs-sepp deb net optional arch=any
- open5gs-sgwc deb net optional arch=any
- open5gs-sgwu deb net optional arch=any
- open5gs-smf deb net optional arch=any
- open5gs-udm deb net optional arch=any
- open5gs-udr deb net optional arch=any
- open5gs-upf deb net optional arch=any
-Checksums-Sha1:
- ffccc538b4eefc18f3f9773c4be6e9429188f94d 14488852 open5gs_2.7.0.140.cd76d.202404122026.tar.xz
-Checksums-Sha256:
- 6eeb12b53d08e1d03a7879dbce79289d542f2d71866f82590903da7dec3ee0bc 14488852 open5gs_2.7.0.140.cd76d.202404122026.tar.xz
-Files:
- 1db1e3872312e2cbad77bc5a13799172 14488852 open5gs_2.7.0.140.cd76d.202404122026.tar.xz

open5gs_2.7.0.143.a6830.202404132026.dsc Added

@@ -0,0 +1,39 @@
+Format: 3.0 (native)
+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.0.143.a6830.202404132026
+Maintainer: Harald Welte <laforge@gnumonks.org>
+Uploaders: Sukchan Lee <acetcom@gmail.com>
+Homepage: https://open5gs.org
+Standards-Version: 4.3.0
+Vcs-Browser: https://github.com/open5gs/open5gs
+Vcs-Git: git://github.com/open5gs/open5gs
+Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
+Package-List:
+ open5gs deb net optional arch=any
+ open5gs-amf deb net optional arch=any
+ open5gs-ausf deb net optional arch=any
+ open5gs-bsf deb net optional arch=any
+ open5gs-common deb net optional arch=any
+ open5gs-dbg deb net optional arch=any
+ open5gs-hss deb net optional arch=any
+ open5gs-mme deb net optional arch=any
+ open5gs-nrf deb net optional arch=any
+ open5gs-nssf deb net optional arch=any
+ open5gs-pcf deb net optional arch=any
+ open5gs-pcrf deb net optional arch=any
+ open5gs-scp deb net optional arch=any
+ open5gs-sepp deb net optional arch=any
+ open5gs-sgwc deb net optional arch=any
+ open5gs-sgwu deb net optional arch=any
+ open5gs-smf deb net optional arch=any
+ open5gs-udm deb net optional arch=any
+ open5gs-udr deb net optional arch=any
+ open5gs-upf deb net optional arch=any
+Checksums-Sha1:
+ 919bff379d39cd4255e6e5a20c9d85ef38d79e28 14492056 open5gs_2.7.0.143.a6830.202404132026.tar.xz
+Checksums-Sha256:
+ ff13e63736c97cb3f29a2e8d3ed11c617775f0ff3a7972dde580a16bac45f930 14492056 open5gs_2.7.0.143.a6830.202404132026.tar.xz
+Files:
+ dc5773dceed2e13ce331c402762b2bf5 14492056 open5gs_2.7.0.143.a6830.202404132026.tar.xz

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/.tarball-version -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/.tarball-version Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/310014.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/310014.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/csfb.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/csfb.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/5gc-sepp1-999-70.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/5gc-sepp1-999-70.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/5gc-sepp2-001-01.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/5gc-sepp2-001-01.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/5gc-sepp3-315-010.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/5gc-sepp3-315-010.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/5gc-tls-sepp1-999-70.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/5gc-tls-sepp1-999-70.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/5gc-tls-sepp2-001-01.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/5gc-tls-sepp2-001-01.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/5gc-tls-sepp3-315-010.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/5gc-tls-sepp3-315-010.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-001-01-ue-001-01.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-001-01-ue-001-01.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-001-01-ue-315-010.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-001-01-ue-315-010.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-001-01-ue-999-70.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-001-01-ue-999-70.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-315-010-ue-001-01.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-315-010-ue-001-01.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-315-010-ue-315-010.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-315-010-ue-315-010.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-315-010-ue-999-70.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-315-010-ue-999-70.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-999-70-ue-001-01.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-999-70-ue-001-01.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-999-70-ue-315-010.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-999-70-ue-315-010.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/examples/gnb-999-70-ue-999-70.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/examples/gnb-999-70-ue-999-70.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/non3gpp.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/non3gpp.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/open5gs/smf.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/open5gs/smf.yaml.in Changed

@@ -34,8 +34,9 @@
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -327,23 +328,26 @@
 #  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48
 #   (If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.)
 #  session:
-#    - subnet: 10.45.0.1/16
+#    - subnet: 10.45.0.0/16
+#      gateway: 10.45.0.1
 #      dnn: internet
-#    - subnet: 2001:db8:cafe::1/48
+#    - subnet: 2001:db8:cafe::/48
 #      dnn: internet
-#    - subnet: 10.46.0.1/16
+#    - subnet: 10.46.0.0/16
+#      gateway: 10.46.0.1
 #      dnn: ims
-#    - subnet: 2001:db8:babe::1/48
+#    - subnet: 2001:db8:babe::/48
 #      dnn: ims
 #
 #  o Pool Range
 #  session:
-#    - subnet: 10.45.0.1/16
+#    - subnet: 10.45.0.0/16
+#      gateway: 10.45.0.1
 #      range:
 #        - 10.45.0.100-10.45.0.200
 #        - 10.45.1.100-
 #        - -10.45.0.200
-#    - subnet: 2001:db8:cafe::1/48
+#    - subnet: 2001:db8:cafe::/48
 #      range:
 #        - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0
 #        - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/open5gs/upf.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/open5gs/upf.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/sample.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/sample.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/slice.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/slice.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/srsenb.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/srsenb.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/volte.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/volte.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/configs/vonr.yaml.in -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/configs/vonr.yaml.in Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/debian/changelog -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/debian/changelog Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/lib/nas/5gs/types.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/lib/nas/5gs/types.c Changed

@@ -483,35 +483,59 @@
 
     ogs_assert(description);
     ogs_assert(descriptions);
-    ogs_assert(descriptions->length);
+
+    if (descriptions->length == 0) {
+        ogs_error("Length is 0");
+        goto cleanup;
+    }
+    if (descriptions->buffer == NULL) {
+        ogs_error("Buffer is NULL");
+        goto cleanup;
+    }
+
     length = descriptions->length;
-    ogs_assert(descriptions->buffer);
     buffer = descriptions->buffer;
 
     size = 0;
     while (size < length) {
         memset(description, 0, sizeof(*description));
 
-        ogs_assert(size+3 <= length);
+        if (size+3 > length) {
+            ogs_error("Overflow : size%d length%d", size, length);
+            goto cleanup;
+        }
         memcpy(description, buffer+size, 3);
         size += 3;
 
         for (i = 0; i < description->num_of_parameter &&
                     i < OGS_NAS_MAX_NUM_OF_QOS_FLOW_PARAMETER; i++) {
-            ogs_assert(size+sizeof(description->parami.identifier) <= length);
+            if (size+sizeof(description->parami.identifier) > length) {
+                ogs_error("Overflow : size%d length%d", size, length);
+                goto cleanup;
+            }
             memcpy(&description->parami.identifier, buffer+size,
                     sizeof(description->parami.identifier));
             size += sizeof(description->parami.identifier);
 
-            ogs_assert(size+sizeof(description->parami.len) <= length);
+            if (size+sizeof(description->parami.len) > length) {
+                ogs_error("Overflow : size%d length%d", size, length);
+                goto cleanup;
+            }
             memcpy(&description->parami.len, buffer+size,
                     sizeof(description->parami.len));
             size += sizeof(description->parami.len);
 
             switch(description->parami.identifier) {
             case OGS_NAX_QOS_FLOW_PARAMETER_ID_5QI:
-                ogs_assert(description->parami.len == 1);
-                ogs_assert(size+description->parami.len <= length);
+                if (description->parami.len != 1) {
+                    ogs_error("Invalid len%d", description->parami.len);
+                    goto cleanup;
+                }
+                if (size+description->parami.len > length) {
+                    ogs_error("Overflow: len%d length%d",
+                            description->parami.len, length);
+                    goto cleanup;
+                }
                 memcpy(&description->parami.qos_index,
                         buffer+size, description->parami.len);
                 size += description->parami.len;
@@ -521,8 +545,15 @@
             case OGS_NAX_QOS_FLOW_PARAMETER_ID_GFBR_DOWNLINK:
             case OGS_NAX_QOS_FLOW_PARAMETER_ID_MFBR_UPLINK:
             case OGS_NAX_QOS_FLOW_PARAMETER_ID_MFBR_DOWNLINK:
-                ogs_assert(description->parami.len == 3);
-                ogs_assert(size+description->parami.len <= length);
+                if (description->parami.len != 3) {
+                    ogs_error("Invalid len%d", description->parami.len);
+                    goto cleanup;
+                }
+                if (size+description->parami.len > length) {
+                    ogs_error("Overflow: len%d length%d",
+                            description->parami.len, length);
+                    goto cleanup;
+                }
                 memcpy(&description->parami.br,
                         buffer+size, description->parami.len);
                 description->parami.br.value =
@@ -530,15 +561,17 @@
                 size += description->parami.len;
                 break;
             default:
-                ogs_fatal("Unknown qos_flow parameter identifier %d",
+                ogs_error("Unknown qos_flow parameter identifier %d",
                         description->parami.identifier);
-                ogs_assert_if_reached();
+                goto cleanup;
             }
         }
 
         description++;
     }
 
+cleanup:
+
     return (int)(description-first);
 }
 
@@ -777,28 +810,50 @@
 
     ogs_assert(rule);
     ogs_assert(rules);
-    ogs_assert(rules->length);
+
+    if (rules->length == 0) {
+        ogs_error("Length is 0");
+        goto cleanup;
+    }
+    if (rules->buffer == NULL) {
+        ogs_error("Buffer is NULL");
+        goto cleanup;
+    }
+
     length = rules->length;
-    ogs_assert(rules->buffer);
     buffer = rules->buffer;
 
     size = 0;
     while (size < length) {
         memset(rule, 0, sizeof(*rule));
 
-        ogs_assert(size+sizeof(rule->identifier) <= length);
+        if (size+sizeof(rule->identifier) > length) {
+            ogs_error("Overflow : size%d length%d", size, length);
+            goto cleanup;
+        }
         memcpy(&rule->identifier, buffer+size, sizeof(rule->identifier));
         size += sizeof(rule->identifier);
 
-        ogs_assert(size+sizeof(rule->length) <= length);
+        if (size+sizeof(rule->length) > length) {
+            ogs_error("Overflow : size%d length%d", size, length);
+            goto cleanup;
+        }
         memcpy(&rule->length, buffer+size, sizeof(rule->length));
         rule->length = be16toh(rule->length);
         size += sizeof(rule->length);
 
-        ogs_assert(size+sizeof(rule->flags) <= length);
+        if (size+sizeof(rule->flags) > length) {
+            ogs_error("Overflow : size%d length%d", size, length);
+            goto cleanup;
+        }
         memcpy(&rule->flags, buffer+size, sizeof(rule->flags));
         size += sizeof(rule->flags);
 
+        if (rule->code == 0 || rule->code == 7) { /* Reserved */
+            ogs_error("Reserved Rule Code %d", rule->code);
+            goto cleanup;
+        }
+
         if (rule->code == OGS_NAS_QOS_CODE_DELETE_EXISTING_QOS_RULE ||
             rule->code == OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_WITHOUT_MODIFYING_PACKET_FILTERS) {
             if (rule->num_of_packet_filter != 0) {
@@ -806,12 +861,16 @@
                         "and number of packet filter%d",
                         rule->code, rule->num_of_packet_filter);
                 rule->num_of_packet_filter = 0;
+                goto cleanup;
             }
         }
 
         for (i = 0; i < rule->num_of_packet_filter &&
                     i < OGS_MAX_NUM_OF_FLOW_IN_GTP; i++) {
-            ogs_assert(size+sizeof(rule->pfi.flags) <= length);
+            if (size+sizeof(rule->pfi.flags) > length) {
+                ogs_error("Overflow : size%d length%d", size, length);
+                goto cleanup;
+            }
             memcpy(&rule->pfi.flags, buffer+size, sizeof(rule->pfi.flags));
             size += sizeof(rule->pfi.flags);
 
@@ -819,24 +878,35 @@
                 OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_DELETE_PACKET_FILTERS)
                 continue;
 
-            ogs_assert(size+sizeof(rule->pfi.content.length) <= length);
+            if (size+sizeof(rule->pfi.content.length) > length) {
+                ogs_error("Overflow : size%d length%d", size, length);
+                goto cleanup;
+            }
             memcpy(&rule->pfi.content.length, buffer+size,
                     sizeof(rule->pfi.content.length));
             size += sizeof(rule->pfi.content.length);
 
             j = 0; len = 0;
             while(len < rule->pfi.content.length) {
-                ogs_assert(size+len+
-                    sizeof(rule->pfi.content.componentj.type) <= length);
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.type) > length) {
+                    ogs_error("Overflow : size%d len%d length%d",
+                            size, len, length);

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/lib/pfcp/context.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/lib/pfcp/context.c Changed

@@ -743,6 +743,7 @@
                     do {
                         ogs_pfcp_subnet_t *subnet = NULL;
                         const char *ipstr = NULL;
+                        const char *gateway = NULL;
                         const char *mask_or_numbits = NULL;
                         const char *dnn = NULL;
                         const char *dev = self.tun_ifname;
@@ -781,6 +782,8 @@
                                         mask_or_numbits = (const char *)v;
                                     }
                                 }
+                            } else if (!strcmp(subnet_key, "gateway")) {
+                                gateway = ogs_yaml_iter_value(&subnet_iter);
                             } else if (!strcmp(subnet_key, "apn") ||
                                         !strcmp(subnet_key, "dnn")) {
                                 dnn = ogs_yaml_iter_value(&subnet_iter);
@@ -825,7 +828,7 @@
                         }
 
                         subnet = ogs_pfcp_subnet_add(
-                                ipstr, mask_or_numbits, dnn, dev);
+                                ipstr, mask_or_numbits, gateway, dnn, dev);
                         ogs_assert(subnet);
 
                         subnet->num_of_range = num;
@@ -2150,7 +2153,7 @@
 
 ogs_pfcp_subnet_t *ogs_pfcp_subnet_add(
         const char *ipstr, const char *mask_or_numbits,
-        const char *dnn, const char *ifname)
+        const char *gateway, const char *dnn, const char *ifname)
 {
     int rv;
     ogs_pfcp_dev_t *dev = NULL;
@@ -2179,6 +2182,43 @@
 
         subnet->family = subnet->gw.family;
         subnet->prefixlen = atoi(mask_or_numbits);
+
+        if (memcmp(subnet->gw.sub, subnet->sub.sub,
+                    sizeof(subnet->gw.sub)) != 0) {
+            char *subnet_string = NULL;
+
+            if (subnet->family == AF_INET) {
+                subnet_string = ogs_ipv4_to_string(subnet->sub.sub0);
+                ogs_assert(subnet_string);
+            } else if (subnet->family == AF_INET6) {
+                subnet_string = ogs_ipv6addr_to_string(
+                        (uint8_t*)&subnet->sub.sub0);
+                ogs_assert(subnet_string);
+            }
+
+            ogs_warn("Please change the configuration files of "
+                    "smf.yaml and upf.yaml as below.");
+            ogs_log_print(OGS_LOG_WARN, "\n<OLD Format>\n");
+            ogs_log_print(OGS_LOG_WARN, "smf:\n");
+            ogs_log_print(OGS_LOG_WARN, "  session:\n");
+            ogs_log_print(OGS_LOG_WARN, "    - subnet: %s/%s\n",
+                    ipstr, mask_or_numbits);
+            ogs_log_print(OGS_LOG_WARN, "\n<NEW Format>\n");
+            ogs_log_print(OGS_LOG_WARN, "smf:\n");
+            ogs_log_print(OGS_LOG_WARN, "  session:\n");
+            ogs_log_print(OGS_LOG_WARN, "    - subnet: %s/%s\n",
+                    subnet_string ? subnet_string : "Unknown", mask_or_numbits);
+            if (subnet->family == AF_INET)
+                ogs_log_print(OGS_LOG_WARN, "      gateway: %s", ipstr);
+            ogs_log_print(OGS_LOG_WARN, "\n\n\n");
+
+            ogs_free(subnet_string);
+        }
+    }
+
+    if (gateway) {
+        rv = ogs_ipsubnet(&subnet->gw, gateway, NULL);
+        ogs_assert(rv == OGS_OK);
     }
 
     if (dnn)

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/lib/pfcp/context.h -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/lib/pfcp/context.h Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/src/amf/ngap-path.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/src/amf/ngap-path.c Changed

@@ -200,6 +200,7 @@
     default:
         ogs_error("Not implemented(security header type:0x%x)",
                 sh->security_header_type);
+        ran_ue_remove(ran_ue);
         return OGS_ERROR;
     }
 
@@ -207,12 +208,39 @@
         if (nas_5gs_security_decode(ran_ue->amf_ue,
                 security_header_type, nasbuf) != OGS_OK) {
             ogs_error("nas_eps_security_decode failed()");
+            ran_ue_remove(ran_ue);
             return OGS_ERROR;
         }
     }
 
     h = (ogs_nas_5gmm_header_t *)nasbuf->data;
     ogs_assert(h);
+    if (procedureCode == NGAP_ProcedureCode_id_InitialUEMessage) {
+        if (h->extended_protocol_discriminator !=
+                OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM) {
+
+            ogs_error("Invalid extended_protocol_discriminator %d",
+                    h->extended_protocol_discriminator);
+
+            ogs_pkbuf_free(nasbuf);
+            ran_ue_remove(ran_ue);
+
+            return OGS_ERROR;
+        }
+
+        if (h->message_type != OGS_NAS_5GS_REGISTRATION_REQUEST &&
+            h->message_type != OGS_NAS_5GS_SERVICE_REQUEST &&
+            h->message_type != OGS_NAS_5GS_DEREGISTRATION_REQUEST_FROM_UE) {
+
+            ogs_error("Invalid 5GMM message type %d", h->message_type);
+
+            ogs_pkbuf_free(nasbuf);
+            ran_ue_remove(ran_ue);
+
+            return OGS_ERROR;
+        }
+    }
+
     if (h->extended_protocol_discriminator ==
             OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM) {
         e = amf_event_new(AMF_EVENT_5GMM_MESSAGE);
@@ -247,7 +275,10 @@
     } else {
         ogs_error("Unknown NAS Protocol discriminator 0x%02x",
                   h->extended_protocol_discriminator);
+
         ogs_pkbuf_free(nasbuf);
+        ran_ue_remove(ran_ue);
+
         return OGS_ERROR;
     }
 }

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/src/mme/s1ap-handler.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/src/mme/s1ap-handler.c Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/src/mme/s1ap-path.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/src/mme/s1ap-path.c Changed

@@ -207,6 +207,7 @@
     default:
         ogs_error("Not implemented(security header type:0x%x)",
                 sh->security_header_type);
+        enb_ue_remove(enb_ue);
         return OGS_ERROR;
     }
 
@@ -214,12 +215,42 @@
         if (nas_eps_security_decode(enb_ue->mme_ue,
                 security_header_type, nasbuf) != OGS_OK) {
             ogs_error("nas_eps_security_decode failed()");
+            enb_ue_remove(enb_ue);
             return OGS_ERROR;
         }
     }
 
     h = (ogs_nas_emm_header_t *)nasbuf->data;
     ogs_assert(h);
+
+    if (procedureCode == S1AP_ProcedureCode_id_initialUEMessage) {
+        if (h->protocol_discriminator != OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM) {
+
+            ogs_error("Invalid protocol_discriminator %d",
+                    h->protocol_discriminator);
+
+            ogs_pkbuf_free(nasbuf);
+            enb_ue_remove(enb_ue);
+
+            return OGS_ERROR;
+        }
+
+        if (h->security_header_type !=
+                OGS_NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE &&
+            h->message_type != OGS_NAS_EPS_ATTACH_REQUEST &&
+            h->message_type != OGS_NAS_EPS_TRACKING_AREA_UPDATE_REQUEST &&
+            h->message_type != OGS_NAS_EPS_EXTENDED_SERVICE_REQUEST &&
+            h->message_type != OGS_NAS_EPS_DETACH_REQUEST) {
+
+            ogs_error("Invalid EMM message type %d", h->message_type);
+
+            ogs_pkbuf_free(nasbuf);
+            enb_ue_remove(enb_ue);
+
+            return OGS_ERROR;
+        }
+    }
+
     if (h->protocol_discriminator == OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM) {
         int rv;
         e = mme_event_new(MME_EVENT_EMM_MESSAGE);
@@ -255,7 +286,10 @@
     } else {
         ogs_error("Unknown/Unimplemented NAS Protocol discriminator 0x%02x",
                   h->protocol_discriminator);
+
         ogs_pkbuf_free(nasbuf);
+        enb_ue_remove(enb_ue);
+
         return OGS_ERROR;
     }
 }

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/src/smf/gsm-handler.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/src/smf/gsm-handler.c Changed

@@ -229,7 +229,11 @@
         int num_of_rule = 0;
 
         num_of_rule = ogs_nas_parse_qos_rules(qos_rule, requested_qos_rules);
-        ogs_assert(num_of_rule > 0);
+        if (!num_of_rule) {
+            ogs_error("%s:%d Invalid modification request",
+                    smf_ue->supi, sess->psi);
+            goto cleanup;
+        }
 
         for (i = 0; i < num_of_rule; i++) {
             qos_flow = smf_qos_flow_find_by_qfi(
@@ -430,7 +434,11 @@
 
         num_of_description = ogs_nas_parse_qos_flow_descriptions(
                 qos_flow_description, requested_qos_flow_descriptions);
-        ogs_assert(num_of_description > 0);
+        if (!num_of_description) {
+            ogs_error("%s:%d Invalid modification request",
+                    smf_ue->supi, sess->psi);
+            goto cleanup;
+        }
 
         for (i = 0; i < num_of_description; i++) {
             qos_flow = smf_qos_flow_find_by_qfi(
@@ -478,16 +486,7 @@
         ogs_error("%s:%d Invalid modification request modify:%d",
                 smf_ue->supi, sess->psi,
                 ogs_list_count(&sess->qos_flow_to_modify_list));
-
-        n1smbuf = gsm_build_pdu_session_modification_reject(sess,
-            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
-        ogs_assert(n1smbuf);
-
-        smf_sbi_send_sm_context_update_error_n1_n2_message(
-                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                n1smbuf, OpenAPI_n2_sm_info_type_NULL, NULL);
-
-        return OGS_ERROR;
+        goto cleanup;
     }
 
     if (pfcp_flags & OGS_PFCP_MODIFY_REMOVE) {
@@ -522,4 +521,15 @@
                 OGS_PFCP_MODIFY_UE_REQUESTED|pfcp_flags, 0));
 
     return OGS_OK;
+
+cleanup:
+    n1smbuf = gsm_build_pdu_session_modification_reject(sess,
+        OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
+    ogs_assert(n1smbuf);
+
+    smf_sbi_send_sm_context_update_error_n1_n2_message(
+            stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+            n1smbuf, OpenAPI_n2_sm_info_type_NULL, NULL);
+
+    return OGS_ERROR;
 }

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/tests/attach/issues-test.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/tests/attach/issues-test.c Changed

open5gs_2.7.0.140.cd76d.202404122026.tar.xz/tests/registration/identity-test.c -> open5gs_2.7.0.143.a6830.202404132026.tar.xz/tests/registration/identity-test.c Changed

Changes of Revision 662