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

[XS] Change in osmo-ci[master]: jobs/{gerrit,master}: use debian-trixie-build-arm for osmo-pcu
by osmith 01 Sep '26

01 Sep '26

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ci/+/43483?usp=email ) Change subject: jobs/{gerrit,master}: use debian-trixie-build-arm for osmo-pcu ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8035264aaa256f5f03b4dee1e7b15d7132a051b6 Gerrit-Change-Number: 43483 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Sep 2026 10:02:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-msc[master]: libvlr: lu_fsm: PS: don't terminate by timer to prevent cascade
by lynxis lazus 01 Sep '26

01 Sep '26

Attention is currently required from: laforge, pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/43481?usp=email ) Change subject: libvlr: lu_fsm: PS: don't terminate by timer to prevent cascade ...................................................................... Patch Set 1: (1 comment) File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/c/osmo-msc/+/43481/comment/5035f3f7_15d0a52e?usp… : PS1, Line 1597: /* The callback might already cleaned up this FSM */ > "might have already cleaned up". […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I483bd3e734b1046fcafdae31189bc5df5b122a48 Gerrit-Change-Number: 43481 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Sep 2026 10:01:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-msc[master]: libvlr: lu_fsm: PS: don't terminate by timer to prevent cascade
by lynxis lazus 01 Sep '26

01 Sep '26

Attention is currently required from: laforge, lynxis lazus. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/43481?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: libvlr: lu_fsm: PS: don't terminate by timer to prevent cascade ...................................................................... libvlr: lu_fsm: PS: don't terminate by timer to prevent cascade To prevent a termination cascade, don't termine the FSM by the timer callback when running as PS/SGSN. Change-Id: I483bd3e734b1046fcafdae31189bc5df5b122a48 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/43481/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I483bd3e734b1046fcafdae31189bc5df5b122a48 Gerrit-Change-Number: 43481 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-msc[master]: libvlr: add PVLR support
by lynxis lazus 01 Sep '26

01 Sep '26

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/43479?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: libvlr: add PVLR support ...................................................................... libvlr: add PVLR support Allow to retrieve information from the PVLR (Previous VLR). In case of PS/SGSN this can be another SGSN or a MME. Introduce a new callback for CS and PS to check if the LAI or RAI is currently served. Change-Id: I189c041dbc3a33ad15746092691cb382d1911495 --- M include/osmocom/vlr/vlr.h M src/libmsc/gsm_04_08.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c 4 files changed, 67 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/43479/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I189c041dbc3a33ad15746092691cb382d1911495 Gerrit-Change-Number: 43479 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/{gerrit,master}: use debian-trixie-build-arm for osmo-pcu
by fixeria 01 Sep '26

01 Sep '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43483?usp=email ) Change subject: jobs/{gerrit,master}: use debian-trixie-build-arm for osmo-pcu ...................................................................... jobs/{gerrit,master}: use debian-trixie-build-arm for osmo-pcu Now that we've fixed the "member access within misaligned address" issues, we can finally use debian:trixie (ARM) for osmo-pcu too. Change-Id: I8035264aaa256f5f03b4dee1e7b15d7132a051b6 Related: libosmocore.git I0424e76e76d8aa9402bd1a5aefe789de16e72fae Related: osmo-pcu.git I39abce68c5678704eea2ad1e330419f645aa4cfd Related: OS#6858, OS#6857 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml M scripts/osmo-ci-docker-rebuild.sh 3 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/43483/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index ed01050..9398fbf 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -384,7 +384,7 @@ DOCKER_IMG="{docker_img}" case "$(arch)" in arm*|aarch64) - DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858 + DOCKER_IMG="$DOCKER_IMG-arm" SETARCH_CMD="setarch linux32" ;; esac diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 8831152..3b8cd47 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -485,7 +485,7 @@ DOCKER_IMG="{docker_img}" case "$(arch)" in arm*|aarch64) - DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858 + DOCKER_IMG="$DOCKER_IMG-arm" SETARCH_CMD="setarch linux32" ;; esac diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index d901826..4461e66 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -13,8 +13,6 @@ ;; arm*|aarch64) # OS#6627: need to run a separate "docker pull" command with platform - # OS#6858: still need bookworm for osmo-pcu - docker pull docker.io/arm32v7/debian:bookworm --platform="linux/arm/v7" docker pull docker.io/arm32v7/debian:trixie --platform="linux/arm/v7" export NO_DOCKER_IMAGE_PULL=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8035264aaa256f5f03b4dee1e7b15d7132a051b6 Gerrit-Change-Number: 43483 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-msc[master]: RFC: libvlr: add PVLR support
by lynxis lazus 01 Sep '26

01 Sep '26

Attention is currently required from: pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/43479?usp=email ) Change subject: RFC: libvlr: add PVLR support ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Why not using different callbacks? In the end if the user is only caring about CS or PS, the other o […] I'll rework this and use 2 different callbacks. The struct gsm0808_cell_id is missing a direct rai. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I189c041dbc3a33ad15746092691cb382d1911495 Gerrit-Change-Number: 43479 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Sep 2026 09:29:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcu[master]: llc: fix misaligned MetaInfo access in msgb headroom
by fixeria 01 Sep '26

01 Sep '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/43143?usp=email ) Change subject: llc: fix misaligned MetaInfo access in msgb headroom ...................................................................... llc: fix misaligned MetaInfo access in msgb headroom struct MetaInfo (two struct timespec) requires 8-byte alignment on some ABIs (e.g. 32-bit ARM with a 64-bit time_t), but msgb->head is only guaranteed byte alignment: struct msgb's own size before the flexible _data[] member is not a multiple of 8, so storing MetaInfo directly at msg->head can misalign it, triggering UBSan -fsanitize=alignment reports wherever recv_time/expire_time are subsequently dereferenced. Reserve extra headroom for worst-case alignment padding and store/retrieve MetaInfo via the next 8-byte-aligned address within that headroom instead of assuming msg->head itself is suitably aligned. Change-Id: I39abce68c5678704eea2ad1e330419f645aa4cfd Related: OS#6858 --- M src/llc.c 1 file changed, 34 insertions(+), 8 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/llc.c b/src/llc.c index 478d23d..8107c0c 100644 --- a/src/llc.c +++ b/src/llc.c @@ -17,6 +17,7 @@ #include <stdio.h> +#include <stdint.h> #include <osmocom/core/msgb.h> @@ -25,6 +26,31 @@ #include "pcu_utils.h" #include "llc.h" +/* struct msgb's flexible '_data' array is only guaranteed to start at an + * address suitable for 'unsigned char', not for arbitrary types: on some + * ABIs (e.g. 32-bit ARM with a 64-bit time_t) 'struct MetaInfo' requires + * stricter (8-byte) alignment than that, courtesy of the embedded + * 'struct timespec' members, so msgb->head itself cannot be assumed to be + * a valid storage location for it. Reserve extra headroom for worst-case + * padding and store/retrieve MetaInfo at the next aligned address instead + * of at msgb->head directly. */ +#define META_INFO_ALIGN _Alignof(struct MetaInfo) +#define META_INFO_HEADROOM (sizeof(struct MetaInfo) + META_INFO_ALIGN - 1) + +/* Allocate a msgb with enough headroom to hold a MetaInfo (plus worst-case + * alignment padding) followed by 'len' bytes of LLC PDU data. */ +static inline struct msgb *llc_msgb_meta_info_alloc(uint16_t len, const char *name) +{ + return msgb_alloc_headroom(META_INFO_HEADROOM + len, META_INFO_HEADROOM, name); +} + +static inline struct MetaInfo *llc_msgb_meta_info_get(const struct msgb *msg) +{ + uintptr_t p = (uintptr_t)msg->head; + p = (p + (META_INFO_ALIGN - 1)) & ~(uintptr_t)(META_INFO_ALIGN - 1); + return (struct MetaInfo *)p; +} + void llc_init(struct gprs_llc *llc) { llc_reset(llc); @@ -148,12 +174,12 @@ struct gprs_llc_hdr *llc_hdr; enum gprs_llc_queue_prio prio; - llc_msg = msgb_alloc_headroom(sizeof(*meta_storage) + len, sizeof(*meta_storage), "llc_pdu_queue"); + llc_msg = llc_msgb_meta_info_alloc(len, "llc_pdu_queue"); if (!llc_msg) return -ENOMEM; /* Fist set up MetaInfo in the msgb headroom: */ - meta_storage = (struct MetaInfo *)llc_msg->head; + meta_storage = llc_msgb_meta_info_get(llc_msg); osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; @@ -215,8 +241,8 @@ msg = msg1; msg1 = NULL; } else { - const struct MetaInfo *mi1 = (struct MetaInfo *)msg1->head; - const struct MetaInfo *mi2 = (struct MetaInfo *)msg2->head; + const struct MetaInfo *mi1 = llc_msgb_meta_info_get(msg1); + const struct MetaInfo *mi2 = llc_msgb_meta_info_get(msg2); if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) { msg = msg1; @@ -250,10 +276,10 @@ struct MetaInfo *meta_storage; unsigned int len = llc_frame_length(llc); - llc_msg = msgb_alloc_headroom(sizeof(*meta_storage) + len, sizeof(*meta_storage), "llc_pdu_queue"); + llc_msg = llc_msgb_meta_info_alloc(len, "llc_pdu_queue"); OSMO_ASSERT(llc_msg); - meta_storage = (struct MetaInfo *)llc_msg->head; + meta_storage = llc_msgb_meta_info_get(llc_msg); memcpy(meta_storage, &llc->meta_info, sizeof(struct MetaInfo)); memcpy(msgb_put(llc_msg, len), llc->frame, len); @@ -283,7 +309,7 @@ if (!msg) return NULL; - meta_storage = (struct MetaInfo *)msg->head; + meta_storage = llc_msgb_meta_info_get(msg); q->queue_size -= 1; q->queue_octets -= msgb_length(msg); @@ -316,7 +342,7 @@ timespecadd(&tv_now, &hyst_delta, &tv_now2); while ((msg = llc_queue_pick_msg(q, &prio))) { - info = (const struct MetaInfo *)msg->head; + info = llc_msgb_meta_info_get(msg); const struct timespec *tv_disc = &info->expire_time; const struct timespec *tv_recv = &info->recv_time; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/43143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I39abce68c5678704eea2ad1e330419f645aa4cfd Gerrit-Change-Number: 43143 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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>

1 0

[S] Change in osmo-pcu[master]: llc: fix misaligned MetaInfo access in msgb headroom
by fixeria 01 Sep '26

01 Sep '26

Attention is currently required from: Hoernchen. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcu/+/43143?usp=email ) Change subject: llc: fix misaligned MetaInfo access in msgb headroom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/43143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I39abce68c5678704eea2ad1e330419f645aa4cfd Gerrit-Change-Number: 43143 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Sep 2026 09:18:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-msc[master]: libvlr: fix linter issues
by lynxis lazus 01 Sep '26

01 Sep '26

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/43482?usp=email ) Change subject: libvlr: fix linter issues ...................................................................... libvlr: fix linter issues Make the linter happy by fixing all issues: - add spaces when policy require it - remove unnecessary return;'s - remove else in `if () {return;} else { foo; }` Change-Id: I99f424b196e3b583716d05e77dcd03b907920af1 --- M include/osmocom/vlr/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_lu_fsm.c M src/libvlr/vlr_sgs.c 6 files changed, 48 insertions(+), 51 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index ea7b4ac..55d237e 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -119,7 +119,7 @@ struct vlr_instance *vlr; /* TODO either populate from HLR or drop this completely? */ - long long unsigned int id; + unsigned long long id; /* Data from HLR */ /* 3GPP TS 23.008 */ /* Always use vlr_subscr_set_imsi() to write to imsi[] */ diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index dca2301..6ddd8bc 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -237,15 +237,15 @@ present = true; } if (vsub->msisdn[0]) { - OSMO_STRBUF_PRINTF(sb, "%sMSISDN-%s", present? ":" : "", vsub->msisdn); + OSMO_STRBUF_PRINTF(sb, "%sMSISDN-%s", present ? ":" : "", vsub->msisdn); present = true; } if (vsub->tmsi != GSM_RESERVED_TMSI) { - OSMO_STRBUF_PRINTF(sb, "%sTMSI-0x%08X", present? ":" : "", vsub->tmsi); + OSMO_STRBUF_PRINTF(sb, "%sTMSI-0x%08X", present ? ":" : "", vsub->tmsi); present = true; } if (vsub->tmsi_new != GSM_RESERVED_TMSI) { - OSMO_STRBUF_PRINTF(sb, "%sTMSInew-0x%08X", present? ":" : "", vsub->tmsi_new); + OSMO_STRBUF_PRINTF(sb, "%sTMSInew-0x%08X", present ? ":" : "", vsub->tmsi_new); present = true; } if (!present) @@ -257,7 +257,7 @@ const char *vlr_subscr_short_name(const struct vlr_subscr *vsub, unsigned int maxlen) { /* cast away the const so we can shorten the string within the static buffer */ - char *name = (char*)vlr_subscr_name(vsub); + char *name = (char *) vlr_subscr_name(vsub); size_t len = strlen(name); if (maxlen < 2) return "-"; @@ -379,7 +379,7 @@ level = LOGL_DEBUG; LOGPSRC(g_vlr_log_cat[OSMO_VLR_LOGC_VLR], level, file, line, "VLR subscr %s %s %s: now used by %s\n", - vlr_subscr_name(vsub), (e->count - old_use_count) > 0? "+" : "-", e->use, + vlr_subscr_name(vsub), (e->count - old_use_count) > 0 ? "+" : "-", e->use, osmo_use_count_name_buf(buf, sizeof(buf), e->use_count)); if (e->count < 0) @@ -713,8 +713,8 @@ } LOGVLR(LOGL_DEBUG, "set Last E-UTRAN PLMN ID on subscriber: %s\n", vsub->sgs.last_eutran_plmn_present ? - osmo_plmn_name(&vsub->sgs.last_eutran_plmn) : - "(none)"); + osmo_plmn_name(&vsub->sgs.last_eutran_plmn) : + "(none)"); } bool vlr_subscr_matches_imsi(struct vlr_subscr *vsub, const char *imsi) @@ -818,7 +818,7 @@ struct sgsn_subscriber_pdp_data * vlr_subscr_pdp_data_alloc(struct vlr_subscr *vsub) { - struct sgsn_subscriber_pdp_data* pdata; + struct sgsn_subscriber_pdp_data *pdata; pdata = talloc_zero(vsub, struct sgsn_subscriber_pdp_data); @@ -1453,7 +1453,7 @@ switch (mi->type) { case GSM_MI_TYPE_IMSI: return osmo_fsm_inst_dispatch(vsub->auth_fsm, - VLR_AUTH_E_MS_ID_IMSI, (void*)mi->imsi); + VLR_AUTH_E_MS_ID_IMSI, (void *) mi->imsi); break; } } @@ -1461,11 +1461,11 @@ if (vsub->lu_fsm) { switch (mi->type) { case GSM_MI_TYPE_IMSI: - return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMSI, (void*)mi->imsi); + return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMSI, (void *) mi->imsi); case GSM_MI_TYPE_IMEI: - return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEI, (void*)mi->imei); + return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEI, (void *) mi->imei); case GSM_MI_TYPE_IMEISV: - return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEISV, (void*)mi->imeisv); + return osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_ID_IMEISV, (void *) mi->imeisv); default: return -EINVAL; } diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 6d4a084..53caae5 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -108,7 +108,7 @@ static const char *vlr_proc_arq_result_name(const struct osmo_fsm_inst *fi) { struct proc_arq_priv *par = fi->priv; - return par->result? gsm48_reject_value_name(par->result) : "PASSED"; + return par->result ? gsm48_reject_value_name(par->result) : "PASSED"; } #define proc_arq_fsm_done(fi, res) _proc_arq_fsm_done(fi, res, __FILE__, __LINE__) @@ -412,18 +412,17 @@ * Set User Error: Unidentified Subscriber */ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; - } else { - /* TMSI was included, are we permitted to use it? */ - if (vlr->cfg.parq_retrieve_imsi) { - /* Obtain_IMSI_VLR */ - osmo_tdef_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_OBTAIN_IMSI, parq_fsm_state_tdef, vlr_tdefs, -1); - return; - } else { - /* Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); - return; - } } + + /* TMSI was included, are we permitted to use it? */ + if (vlr->cfg.parq_retrieve_imsi) { + /* Obtain_IMSI_VLR */ + osmo_tdef_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_OBTAIN_IMSI, parq_fsm_state_tdef, vlr_tdefs, -1); + return; + } + + /* Set User Error: Unidentified Subscriber */ + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); } /* ID REQ(IMSI) has returned */ @@ -493,7 +492,7 @@ if (!data) LOGPFSML(fi, LOGL_ERROR, "invalid ciphering result: NULL\n"); else - result = *(enum vlr_ciph_result_cause*)data; + result = *((enum vlr_ciph_result_cause *) data); switch (result) { case VLR_CIPH_COMPL: @@ -788,14 +787,14 @@ static const struct osmo_fsm_state upd_loc_child_vlr_states[] = { [ULC_S_IDLE] = { - .in_event_mask = , + .in_event_mask = TODO, .out_state_mask = S(ULC_S_WAIT_HLR_RESP) | S(ULC_S_DONE), .name = "IDLE", .action = upd_loc_child_f_idle, }, [ULC_S_WAIT_HLR_RESP] = { - .in_event_mask = , + .in_event_mask = TODO, .out_state_mask = S(ULC_S_DONE), .name = "WAIT-HLR-RESP", .action = upd_loc_child_f_w_hlr, diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index b3bd236..76858aa 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -196,7 +196,7 @@ " (MS is %sR99 capable, vec has %sUMTS AKA tokens, res_len=%u is %s)\n", is_r99 ? "" : "NOT ", (vec->auth_types & OSMO_AUTH_TYPE_UMTS) ? "" : "NO ", - res_len, (res_len == vec->res_len)? "valid" : "INVALID on UTRAN"); + res_len, (res_len == vec->res_len) ? "valid" : "INVALID on UTRAN"); goto out_false; } @@ -213,21 +213,21 @@ " context\n"); vsub->sec_ctx = VLR_SEC_CTX_UMTS; return true; - } else { - if (res_len != sizeof(vec->sres) - || memcmp(res, vec->sres, sizeof(vec->sres))) { - LOGVSUBP(LOGL_INFO, vsub, "GSM AUTH failure:" - " mismatching sres (expected sres=%s)\n", - osmo_hexdump(vec->sres, sizeof(vec->sres))); - goto out_false; - } - - LOGVSUBP(LOGL_INFO, vsub, "AUTH established GSM security" - " context\n"); - vsub->sec_ctx = VLR_SEC_CTX_GSM; - return true; } + if (res_len != sizeof(vec->sres) + || memcmp(res, vec->sres, sizeof(vec->sres))) { + LOGVSUBP(LOGL_INFO, vsub, "GSM AUTH failure:" + " mismatching sres (expected sres=%s)\n", + osmo_hexdump(vec->sres, sizeof(vec->sres))); + goto out_false; + } + + LOGVSUBP(LOGL_INFO, vsub, "AUTH established GSM security" + " context\n"); + vsub->sec_ctx = VLR_SEC_CTX_GSM; + return true; + out_false: vsub->sec_ctx = VLR_SEC_CTX_NONE; return false; diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 4bed335..e63f1ee 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -157,7 +157,7 @@ static inline struct vlr_subscr *upd_hlr_vlr_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &upd_hlr_vlr_fsm); - return (struct vlr_subscr*)fi->priv; + return (struct vlr_subscr *) fi->priv; } struct osmo_fsm_inst * @@ -269,7 +269,7 @@ static inline struct vlr_subscr *sub_pres_vlr_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &sub_pres_vlr_fsm); - return (struct vlr_subscr*)fi->priv; + return (struct vlr_subscr *) fi->priv; } /* THIS IS CURRENTLY DEAD CODE, SINCE WE NEVER SET vsub->ms_not_reachable_flag = true. @@ -668,7 +668,7 @@ static inline struct lu_compl_vlr_priv *lu_compl_vlr_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &lu_compl_vlr_fsm); - return (struct lu_compl_vlr_priv*)fi->priv; + return (struct lu_compl_vlr_priv *) fi->priv; } struct osmo_fsm_inst * @@ -1271,7 +1271,7 @@ if (!data) LOGPFSML(fi, LOGL_ERROR, "invalid ciphering result: NULL\n"); else - result = *(enum vlr_ciph_result_cause*)data; + result = *((enum vlr_ciph_result_cause *) data); switch (result) { case VLR_CIPH_COMPL: @@ -1393,7 +1393,7 @@ case VLR_ULA_E_LU_COMPL_FAILURE: cause = GSM48_REJECT_NETWORK_FAILURE; if (data) - cause = *(uint8_t*)data; + cause = *((uint8_t *) data); lu_fsm_discard_lu_compl_fsm(fi); lu_fsm_failure(fi, cause); break; @@ -1425,7 +1425,7 @@ vsub->sub_dataconf_by_hlr_ind = false; cause = GSM48_REJECT_NETWORK_FAILURE; if (data) - cause = *(uint8_t*)data; + cause = *((uint8_t *) data); lu_fsm_discard_lu_compl_fsm(fi); lu_fsm_failure(fi, cause); break; @@ -1635,7 +1635,7 @@ static inline struct lu_fsm_priv *lu_fsm_fi_priv(struct osmo_fsm_inst *fi) { OSMO_ASSERT(fi->fsm == &vlr_lu_fsm); - return (struct lu_fsm_priv*)fi->priv; + return (struct lu_fsm_priv *) fi->priv; } static struct osmo_fsm_inst * diff --git a/src/libvlr/vlr_sgs.c b/src/libvlr/vlr_sgs.c index 755db1e..631ae29 100644 --- a/src/libvlr/vlr_sgs.c +++ b/src/libvlr/vlr_sgs.c @@ -319,8 +319,6 @@ /* Balance ref count increment from vlr_sgs_pag() */ vlr_subscr_put(vsub, VSUB_USE_SGS_PAGING_REQ); - - return; } /*! Notify that a paging message has been sent and a paging is now in progress. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I99f424b196e3b583716d05e77dcd03b907920af1 Gerrit-Change-Number: 43482 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-msc[master]: libvlr: add FIXME for separation of local and foreign TMSI
by lynxis lazus 01 Sep '26

01 Sep '26

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/43478?usp=email ) Change subject: libvlr: add FIXME for separation of local and foreign TMSI ...................................................................... libvlr: add FIXME for separation of local and foreign TMSI Change-Id: I62ddaa17f7f627d61f26db5e299e01ef016df045 --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index df8eb9e..dca2301 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -576,6 +576,7 @@ const char *file, int line) { + /* FIXME: we need to add a type to the tmsi (local, foreign) so overlaps doesn't matter */ struct vlr_subscr *vsub; vsub = _vlr_subscr_find_by_tmsi(vlr, tmsi, use, file, line); if (vsub) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I62ddaa17f7f627d61f26db5e299e01ef016df045 Gerrit-Change-Number: 43478 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log September 2026