June 2026 - gerrit-log - lists.osmocom.org

[S] Change in osmo-pcap[master]: tls: fix broken certificate hostname verification
by laforge 23 Jun '26

23 Jun '26

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email ) Change subject: tls: fix broken certificate hostname verification ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If64950a698bfcfbf556a37ef1be3e68abc124384 Gerrit-Change-Number: 42849 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 Jun 2026 08:59:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: utils: fix typos
by osmith 23 Jun '26

23 Jun '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/42865?usp=email ) Change subject: utils: fix typos ...................................................................... utils: fix typos Change-Id: Ib8ede7cbfed9198f59fe2899fe4b68eac5ac9a23 --- M utils/gsmtap-logsend.c M utils/osmo-config-merge.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/utils/gsmtap-logsend.c b/utils/gsmtap-logsend.c index 97a838b..67114e7 100644 --- a/utils/gsmtap-logsend.c +++ b/utils/gsmtap-logsend.c @@ -101,7 +101,7 @@ gsmtap_fd = gsmtap_source_init_fd(dest_host, dest_port); if (gsmtap_fd < 0) { - fprintf(stderr, "Unable to create GSMTAP soicket: %s\n", strerror(errno)); + fprintf(stderr, "Unable to create GSMTAP socket: %s\n", strerror(errno)); exit(2); } diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index f7db945..d297d01 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -161,7 +161,7 @@ line_num++; chomp(line); int indent = count_indent(line); - bool coment = line_is_comment(&line[indent]); + bool comment = line_is_comment(&line[indent]); struct node *n; if (indent > cur_indent) { @@ -190,7 +190,7 @@ /* comments are not part of the indentation structure of the * file, hence commands after it are not to be affected by them: */ - if (!coment) { + if (!comment) { last = n; cur_indent = indent; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/42865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8ede7cbfed9198f59fe2899fe4b68eac5ac9a23 Gerrit-Change-Number: 42865 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: server: fix NULL deref of file_hdr_msg when store is disabled
by fixeria 23 Jun '26

23 Jun '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42848?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: server: fix NULL deref of file_hdr_msg when store is disabled ...................................................................... server: fix NULL deref of file_hdr_msg when store is disabled When a connection has storing disabled (no store), conn->file_hdr_msg is never populated. The previous link-header handling skipped the first branch (gated on conn->store) and fell through to the comparison branch, which dereferenced the still-NULL conn->file_hdr_msg, crashing the server on the first PKT_LINK_HDR from such a client. Gate the whole header tracking on conn->store and simply free the message when not storing, since osmo_pcap_conn_restart_trace() already no-ops in that case. Change-Id: I419e1b66d07307c3e49294984887c153cd8494c3 AI-Assisted: yes (Claude) --- M src/osmo_server_network.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 81ad74e..37a5b03 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -166,7 +166,10 @@ if ((rc = validate_link_hdr(conn, data)) < 0) return rc; - if (conn->store && !conn->wrf) { + if (!conn->store) { + /* Not storing to a file: no link header to track or compare. */ + msgb_free(msg); + } else if (!conn->wrf) { /* First received link hdr in conn */ update_conn_file_hdr_msg(conn, msg); } else if (msgb_l2len(conn->file_hdr_msg) != msgb_l2len(msg) || -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I419e1b66d07307c3e49294984887c153cd8494c3 Gerrit-Change-Number: 42848 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: server: vty: validate rotate-localtime modulus against the new interval
by fixeria 23 Jun '26

23 Jun '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42847?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: server: vty: validate rotate-localtime modulus against the new interval ...................................................................... server: vty: validate rotate-localtime modulus against the new interval apply_rotate_localtime() computed the maximum allowed modulus from pcap_server->rotate_localtime.intv, the currently-stored (old) interval, rather than the intv argument being applied. On first configuration the stored interval is the default 0, so the switch hit the default case and rejected an otherwise valid command; when changing intervals the modulus was bounds-checked against the wrong interval. Switch on intv instead. Change-Id: I0b367d4e255db3208b41e12adec682026b99cc18 AI-Assisted: yes (Claude) --- M src/osmo_server_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index f96df7f..afdfcd8 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -289,7 +289,7 @@ static int apply_rotate_localtime(struct vty *vty, enum time_interval intv, unsigned int modulus) { unsigned int max_mod = 0; - switch (pcap_server->rotate_localtime.intv) { + switch (intv) { case TIME_INTERVAL_SEC: max_mod = 60; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42847?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I0b367d4e255db3208b41e12adec682026b99cc18 Gerrit-Change-Number: 42847 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: client: honor IPv4 header length in GPRS filter
by fixeria 23 Jun '26

23 Jun '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42845?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: client: honor IPv4 header length in GPRS filter ...................................................................... client: honor IPv4 header length in GPRS filter The GPRS-NS/BSSGP filter assumed a fixed 20-byte IPv4 header (IP_LEN) when locating the UDP header and payload. When the captured packet carries IPv4 options (ip_hl > 5), udp_data/payload_data pointed into the middle of the headers and check_gprs() parsed garbage, classifying packets incorrectly. Use the actual header length from ip_hl, reject malformed headers (ip_hl < 5), and re-validate that the larger headers fit within the captured length before computing the payload. Change-Id: Iac1fa9cc2a3c06cbe19c3e7799a0b335f2e3dda9 AI-Assisted: yes (Claude) --- M src/osmo_client_core.c 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index dbc2588..61e7cc0 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -108,6 +108,7 @@ { int ll_type; int offset; + size_t ip_hdr_len; struct ip *ip_hdr; const u_char *ip_data; const u_char *udp_data; @@ -145,9 +146,19 @@ if (ip_hdr->ip_p != 17) return 1; - udp_data = ip_data + IP_LEN; + /* Honour the actual IPv4 header length (ip_hl), which may be larger + * than IP_LEN when IP options are present. */ + ip_hdr_len = ip_hdr->ip_hl * 4; + if (ip_hdr_len < IP_LEN) + return 1; /* malformed IPv4 header */ + + /* Re-check that the (possibly larger) headers fit within the capture */ + if (offset + ip_hdr_len + UDP_LEN + NS_LEN > hdr->caplen) + return 1; + + udp_data = ip_data + ip_hdr_len; payload_data = udp_data + UDP_LEN; - payload_len = hdr->caplen - offset - IP_LEN - UDP_LEN; + payload_len = hdr->caplen - offset - ip_hdr_len - UDP_LEN; return check_gprs(payload_data, payload_len); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Iac1fa9cc2a3c06cbe19c3e7799a0b335f2e3dda9 Gerrit-Change-Number: 42845 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: tls: do not treat GNUTLS_E_AGAIN/INTERRUPTED as fatal on read
by fixeria 23 Jun '26

23 Jun '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42846?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tls: do not treat GNUTLS_E_AGAIN/INTERRUPTED as fatal on read ...................................................................... tls: do not treat GNUTLS_E_AGAIN/INTERRUPTED as fatal on read osmo_tls_client_bfd_cb() treated any non-positive return from gnutls_record_recv() as a fatal error and tore down the session. On a non-blocking socket gnutls_record_recv() can return GNUTLS_E_AGAIN or GNUTLS_E_INTERRUPTED (both negative but non-fatal), which would drop an otherwise healthy TLS session. Handle them as retryable, mirroring the existing logic in tls_write(). Change-Id: If2f842b202dd08c07dffe3770c51cf0ce886beee AI-Assisted: yes (Claude) --- M src/osmo_tls.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_tls.c b/src/osmo_tls.c index 8524ee3..f06f50e 100644 --- a/src/osmo_tls.c +++ b/src/osmo_tls.c @@ -264,7 +264,11 @@ if (what & OSMO_FD_READ) { int rc = tls_read(sess); - if (rc <= 0) { + /* A non-blocking read may legitimately return GNUTLS_E_AGAIN or + * GNUTLS_E_INTERRUPTED; these are not errors, just retry later. */ + if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN) { + /* nothing to do, wait for the next read event */ + } else if (rc <= 0) { sess->error(sess); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42846?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If2f842b202dd08c07dffe3770c51cf0ce886beee Gerrit-Change-Number: 42846 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: server: fix msgb leak on duplicate link header
by laforge 23 Jun '26

23 Jun '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42844?usp=email ) Change subject: server: fix msgb leak on duplicate link header ...................................................................... server: fix msgb leak on duplicate link header rx_link_hdr() takes ownership of msg on success (rx_link() only frees it on failure). Both branches that call update_conn_file_hdr_msg() free msg, but when an identical link header was already stored neither branch ran and msg was leaked. This happens on every duplicate PKT_LINK_HDR, e.g. a client that periodically resends its header. Free msg explicitly in that case. Change-Id: I79344fe942342f2a736878142b3cf036fc982eef AI-Assisted: yes (Claude) --- M src/osmo_server_network.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 6c0e609..81ad74e 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -173,6 +173,9 @@ memcmp(msgb_l2(conn->file_hdr_msg), msgb_l2(msg), msgb_l2len(msg)) != 0) { /* Client changed the link hdr in conn */ update_conn_file_hdr_msg(conn, msg); + } else { + /* Identical link hdr already stored, nothing to do but free msg */ + msgb_free(msg); } return 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42844?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I79344fe942342f2a736878142b3cf036fc982eef Gerrit-Change-Number: 42844 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: client: Fix 32-bit overflow when computing pcapng EPB timestamp
by laforge 23 Jun '26

23 Jun '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42842?usp=email ) Change subject: client: Fix 32-bit overflow when computing pcapng EPB timestamp ...................................................................... client: Fix 32-bit overflow when computing pcapng EPB timestamp tv_sec * 1000 * 1000 was evaluated in int arithmetic. Where time_t / tv_sec is 32-bit, this overflows for any tv_sec > ~2147, corrupting the 64-bit timestamp_usec well before the year 2038. Cast tv_sec to uint64_t before the multiplication so the whole expression is computed in 64 bits. Change-Id: I20d3282b8cba1675ce2d0860e66027e5ee8245ef AI-Assisted: yes (Claude) --- M src/osmo_client_network.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index 4b91429..69308fe 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -207,7 +207,7 @@ int rc; epb_pars = (struct osmo_pcapng_file_epb_pars){ - .timestamp_usec = (pkthdr->ts.tv_sec * 1000 * 1000) + pkthdr->ts.tv_usec, + .timestamp_usec = ((uint64_t)pkthdr->ts.tv_sec * 1000 * 1000) + pkthdr->ts.tv_usec, .interface_id = ph->idx, .captured_data = data, .captured_len = pkthdr->caplen, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42842?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I20d3282b8cba1675ce2d0860e66027e5ee8245ef Gerrit-Change-Number: 42842 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: server: do not abort process on short conn message
by laforge 23 Jun '26

23 Jun '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42841?usp=email ) Change subject: server: do not abort process on short conn message ...................................................................... server: do not abort process on short conn message conn_read_cb() used OSMO_ASSERT() to check that the received message holds at least a full osmo_pcap_data header. Although conn_segmentation_cb2() should only ever hand up complete frames, asserting on a length derived from network input means a framing anomaly would abort the entire server (taking down all other clients' captures). Close the offending connection gracefully instead, consistent with the other error paths in this function. Change-Id: Ia102ff918ef8152d212e10a860f5dc70efec880b AI-Assisted: yes (Claude) --- M src/osmo_server_network.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index da14480..6c0e609 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -449,7 +449,14 @@ return 0; } - OSMO_ASSERT(msgb_length(msg) >= sizeof(*data)); + if (OSMO_UNLIKELY(msgb_length(msg) < sizeof(*data))) { + /* Should not happen: conn_segmentation_cb2() only hands us complete + * frames. Close the conn gracefully instead of aborting the server. */ + LOGP(DSERVER, LOGL_ERROR, "Read short message from conn: %u < %zu\n", + msgb_length(msg), sizeof(*data)); + osmo_pcap_conn_close(conn); + return 0; + } msg->l1h = msgb_data(msg); data = (struct osmo_pcap_data *)msg->l1h; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ia102ff918ef8152d212e10a860f5dc70efec880b Gerrit-Change-Number: 42841 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: server: fix zmq message leak on send failure
by laforge 23 Jun '26

23 Jun '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42843?usp=email ) Change subject: server: fix zmq message leak on send failure ...................................................................... server: fix zmq message leak on send failure zmq_msg_send() only transfers ownership of the message to ZeroMQ on success. On failure the caller retains ownership, so the previously init'd zmq_msg_t was leaked on every failed publish. Close it explicitly on the error path. Change-Id: I501b1bf55bede4e69fa5d9b3f38d87341482ff49 AI-Assisted: yes (Claude) --- M src/osmo_server_core.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_server_core.c b/src/osmo_server_core.c index a13c64c..cc2c24e 100644 --- a/src/osmo_server_core.c +++ b/src/osmo_server_core.c @@ -59,9 +59,11 @@ memcpy(zmq_msg_data(&msg), data, len); rc = zmq_msg_send(&msg, publ, flags); if (rc == -1) { - /* is the zmq_msg now owned? leak??? */ + /* zmq_msg_send() only transfers ownership of the message on + * success; on failure we still own it and must close it. */ LOGP(DSERVER, LOGL_ERROR, "Failed to send data rc=%d errno=%d/%s\n", rc, errno, strerror(errno)); + zmq_msg_close(&msg); return; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42843?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I501b1bf55bede4e69fa5d9b3f38d87341482ff49 Gerrit-Change-Number: 42843 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log June 2026