- gerrit-log - lists.osmocom.org

[XS] Change in ...osmo-s1gw[master]: pfcp_peer: wrap seq_nr at 24-bit boundary
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42291?usp=email ) Change subject: pfcp_peer: wrap seq_nr at 24-bit boundary ...................................................................... pfcp_peer: wrap seq_nr at 24-bit boundary PFCP sequence numbers are 24-bit (3GPP TS 29.244 section 7.2.2.2), but the counter was incremented without wrapping, eventually exceeding the type spec after 16,777,215 requests. Introduce PFCP_SEQ_NR_MAX and use it in the type spec and in the increment expression. Change-Id: Ie269894add9a82c36698320379df3aca3f7ffea8 --- M src/pfcp_peer.erl 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index f6e9c7d..a4cc2d5 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -57,13 +57,14 @@ %% 3GPP TS 29.244, section 4.2 "UDP Header and Port Numbers" -define(PFCP_PORT, 8805). +-define(PFCP_SEQ_NR_MAX, 16#ffffff). -define(PFCP_SEID_MAX, 16#ffffffffffffffff). -define(PFCP_HEARTBEAT_REQ_TIMEOUT, 2000). -type pfcp_session_rsp() :: ok | {error, term()}. -type pfcp_msg_type() :: atom(). --type pfcp_seq_nr() :: 0..16#ffffff. +-type pfcp_seq_nr() :: 0..?PFCP_SEQ_NR_MAX. -type pfcp_seid() :: 0..?PFCP_SEID_MAX. -type pfcp_f_seid() :: #f_seid{}. -type pfcp_ies() :: [term()] | map() | binary(). @@ -462,7 +463,8 @@ Data = pfcp_packet:encode(PDU), case send_data(Data, S) of ok -> - {ok, S#peer_state{seq_nr = SeqNr + 1}}; + NextSeqNr = (SeqNr + 1) band ?PFCP_SEQ_NR_MAX, + {ok, S#peer_state{seq_nr = NextSeqNr}}; {error, Error} -> {{error, Error}, S} end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42291?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie269894add9a82c36698320379df3aca3f7ffea8 Gerrit-Change-Number: 42291 Gerrit-PatchSet: 1 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-s1gw[master]: pfcp_peer: replace deprecated erlang:timestamp/0 with os:system_time/1
by fixeria 10 Mar '26

10 Mar '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42292?usp=email ) Change subject: pfcp_peer: replace deprecated erlang:timestamp/0 with os:system_time/1 ...................................................................... pfcp_peer: replace deprecated erlang:timestamp/0 with os:system_time/1 erlang:timestamp/0 is deprecated since OTP 18. os:system_time(second) is the modern replacement and yields the result directly in seconds, removing the need to reassemble the {MegaSec, Sec, _} tuple. Change-Id: I4ad886a2222f0cee8a668b42efe8bfac800a55ac --- M src/pfcp_peer.erl 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index a4cc2d5..e1b3aa1 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -477,11 +477,10 @@ -spec get_recovery_timestamp() -> pos_integer(). get_recovery_timestamp() -> - {NowMS, NowS, _NowUS} = erlang:timestamp(), - %% erlang:timestamp() returns time relative to the UNIX epoch (1970), + %% os:system_time/1 returns time relative to the UNIX epoch (1970), %% but for PFCP we need time relative to the NTP era 0 (1900). %% 2208988800 is the diff between 1900 and 1970. - NowMS * 1_000_000 + NowS + 2208988800. + os:system_time(second) + 2208988800. -spec get_f_seid(pfcp_seid(), peer_state()) -> pfcp_f_seid(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42292?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4ad886a2222f0cee8a668b42efe8bfac800a55ac Gerrit-Change-Number: 42292 Gerrit-PatchSet: 1 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

[M] Change in ...osmo-s1gw[master]: enb_registry: rework handling of eNB property updates
by fixeria 10 Mar '26

10 Mar '26

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42299?usp=email ) Change subject: enb_registry: rework handling of eNB property updates ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ib5c5dedce729151cd7350390987fdd008b254ef4 Gerrit-Change-Number: 42299 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Mar 2026 09:33:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: enb_registry: fix duplicate registration check in enb_register/0
by fixeria 10 Mar '26

10 Mar '26

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42297?usp=email ) Change subject: enb_registry: fix duplicate registration check in enb_register/0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42297?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ia64f3e2e79bea055e5c37df9bce91a4bcbf7184c Gerrit-Change-Number: 42297 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Mar 2026 09:33:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ccid-firmware[master]: main: fix crash when ccid_df_write_in() fails
by laforge 10 Mar '26

10 Mar '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42161?usp=email ) Change subject: main: fix crash when ccid_df_write_in() fails ...................................................................... main: fix crash when ccid_df_write_in() fails The OSMO_ASSERT(msg->list.next != LLIST_POISON1) are checking msgb which has been removed from the llist. All llist members which aren't part of a list have LLIST_POISON1 assigned. These OSMO_ASSERT()s will always trigger this msgb. Fixes: a684bc4e38b4 ("Make ch9 usb tests work") Change-Id: I49c81fba756f3620638b6c6c664f53e4a8758ef9 --- M sysmoOCTSIM/main.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 74de4bf..ce4d4e6 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -172,10 +172,6 @@ ep_q->in_progress = msg; rc = ccid_df_write_in(msgb_data(msg), msgb_length(msg)); if (rc != ERR_NONE) { - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) printf("EP %s failed: %d\r\n", ep_q->name, rc); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I49c81fba756f3620638b6c6c664f53e4a8758ef9 Gerrit-Change-Number: 42161 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-ccid-firmware[master]: main: don't access msgbs after giving them away
by laforge 10 Mar '26

10 Mar '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42162?usp=email ) Change subject: main: don't access msgbs after giving them away ...................................................................... main: don't access msgbs after giving them away Because of IRQ, it is dangerous to access a msgb, which has been giving away to a queue (ownership transfer). Further OSMO_ASSERT() should never fail on a queue'd object, except it has been taken already from an IRQ context. Fix a potential crash. Fixes: a684bc4e38b4 ("Make ch9 usb tests work") Change-Id: I79844f77d5cd75e08b0eb44b22c4ad223cb79dcb --- M sysmoOCTSIM/main.c 1 file changed, 0 insertions(+), 30 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index ce4d4e6..92c5bbd 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -199,8 +199,6 @@ if (rc != ERR_NONE) { // ep_q->in_progress = msg; // msgb_enqueue_irqsafe(&ep_q->list, msg); - // OSMO_ASSERT(msg->list.next != LLIST_POISON1) - // OSMO_ASSERT(msg->list.prev != LLIST_POISON2) printf("EP %s failed: %d\r\n", ep_q->name, rc); return -1; } @@ -226,10 +224,6 @@ if (rc != ERR_NONE) { /* re-add to the list of free msgb's */ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) return 0; } return 1; @@ -262,10 +256,6 @@ msgb_put(msg, transferred); /* append to list of pending-to-be-handed messages */ llist_add_tail_at(&msg->list, &g_ccid_s.out_ep.list); - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) g_ccid_s.out_ep.in_progress = NULL; if(code != USB_XFER_DONE) @@ -283,10 +273,6 @@ if (msg) { /* return the message back to the queue of free message buffers */ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) g_ccid_s.in_ep.in_progress = NULL; } @@ -308,10 +294,6 @@ if (msg) { /* return the message back to the queue of free message buffers */ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) g_ccid_s.irq_ep.in_progress = NULL; } @@ -513,10 +495,6 @@ /* append to list of pending-to-be-handed messages */ llist_add_tail_at(&msg->list, &g_ccid_s.in_ep.list); - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) submit_next_in(); return 0; } @@ -578,10 +556,6 @@ while ((msg = msgb_dequeue_irqsafe(&cur_epq->list))) { msgb_reset(msg); llist_add_tail_at(&msg->list, &g_ccid_s.free_q); - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) } #if 0 struct msgb *cur_msg = cur_epq->in_progress; @@ -593,10 +567,6 @@ msgb_reset(cur_msg); llist_add_tail_at(&cur_msg->list, &g_ccid_s.free_q); - OSMO_ASSERT(msg->list.next != LLIST_POISON1) - OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) - OSMO_ASSERT(msg->list.prev != LLIST_POISON2) - OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) cur_epq->in_progress = NULL; } #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I79844f77d5cd75e08b0eb44b22c4ad223cb79dcb Gerrit-Change-Number: 42162 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-ccid-firmware[master]: main: don't access msgbs after giving them away
by laforge 10 Mar '26

10 Mar '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42162?usp=email ) Change subject: main: don't access msgbs after giving them away ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I79844f77d5cd75e08b0eb44b22c4ad223cb79dcb Gerrit-Change-Number: 42162 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 10 Mar 2026 09:29:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ccid-firmware[master]: main: fix crash when ccid_df_write_in() fails
by laforge 10 Mar '26

10 Mar '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42161?usp=email ) Change subject: main: fix crash when ccid_df_write_in() fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I49c81fba756f3620638b6c6c664f53e4a8758ef9 Gerrit-Change-Number: 42161 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 10 Mar 2026 09:29:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ccid-firmware[master]: main: fix crash when ccid_df_write_in() fails
by laforge 10 Mar '26

10 Mar '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42161?usp=email ) Change subject: main: fix crash when ccid_df_write_in() fails ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I49c81fba756f3620638b6c6c664f53e4a8758ef9 Gerrit-Change-Number: 42161 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 10 Mar 2026 09:29:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ccid-firmware[master]: main: don't access msgbs after giving them away
by laforge 10 Mar '26

10 Mar '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42162?usp=email ) Change subject: main: don't access msgbs after giving them away ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I79844f77d5cd75e08b0eb44b22c4ad223cb79dcb Gerrit-Change-Number: 42162 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 10 Mar 2026 09:29:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log