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

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by pespin 19 Aug '26

19 Aug '26

Attention is currently required from: laforge, lynxis lazus, osmith. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email ) Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:39:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by lynxis lazus 19 Aug '26

19 Aug '26

Attention is currently required from: laforge, lynxis lazus, osmith. Hello Jenkins Builder, laforge, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... contrib/jenkins.sh: pin libosmocore to the last release Ensure the libosmocore version doesn't move while building firmwares which are published. This improve reproducible builds. Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c --- M contrib/jenkins.sh 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/81/43281/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[L] Change in osmo-ttcn3-hacks[master]: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites
by pespin 19 Aug '26

19 Aug '26

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?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: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites ...................................................................... DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites A man-in-the-middle component DIAMETER_ConnHdlr_CT was used so far for tests willing to use multiple DIAMETER_ConnHdlr connected to a single component served by multiple DIAMETER_Emulation. Remove the need for this component by modifying the DIAMETER_ConnHdlr component to have an array of ports. This way the same ConnHdlr can be registered on multiple DIAMETER_Emulation components directly. Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 --- M dia2gsup/DIA2GSUP_Tests.ttcn M epdg/EPDG_Tests.ttcn M hss/HSS_Tests.ttcn M library/DIAMETER_Emulation.ttcn M mme/ConnHdlr.ttcn M mme/MME_Tests.ttcn M pcrf/PCRF_Tests.ttcn M pgw/PGW_Tests.ttcn 8 files changed, 153 insertions(+), 304 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/43284/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 Gerrit-Change-Number: 43284 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: linuxlist: drop no-op prefetch() calls
by laforge 19 Aug '26

19 Aug '26

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/43151?usp=email ) Change subject: linuxlist: drop no-op prefetch() calls ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/43151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id84973330df44b4efdd1bd85e4b7c3cb88642f92 Gerrit-Change-Number: 43151 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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:33:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-msc[master]: iu: Fix encoding of IPv6 RTP address in RAB Ass Req
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email ) Change subject: iu: Fix encoding of IPv6 RTP address in RAB Ass Req ...................................................................... iu: Fix encoding of IPv6 RTP address in RAB Ass Req Use the newly added ranap_new_msg_rab_assign_voice2() API from osmo-iuh, which allows passing a struct osmo_sockaddr hence supporting IPv6. This way we get rid of the use of deprecated inet_addr() API. Also make sure to avoid crashing if the function fails (return NULL). Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f --- M TODO-RELEASE M src/libmsc/ran_msg_iu.c 2 files changed, 16 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 84a2985..0a60dbb 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libosmovty >=1.12.1 working optional-multi-choice libosmocore >1.12.0 log_get_context(), log_{get,set}_filter(_data)() libosmogsm >1.14.1 gsm_septet_pack2() +osmo-iuh >1.8.0 ranap_new_msg_rab_assign_voice2() diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index 37cdf10..823c91b 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -348,7 +348,7 @@ { struct msgb *msg; bool use_x213_nsap; - uint32_t cn_rtp_ip; + struct osmo_sockaddr cn_rtp_addr = {}; static uint8_t next_rab_id = 1; uint8_t rab_id = next_rab_id; @@ -356,22 +356,29 @@ if (!next_rab_id) next_rab_id = 1; - cn_rtp_ip = osmo_htonl(inet_addr(ac->cn_rtp->ip)); - - if (cn_rtp_ip == INADDR_NONE) { - LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP IP-Address\n"); - return NULL; - } + OSMO_ASSERT(ac->cn_rtp); if (ac->cn_rtp->port == 0) { LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP port\n"); return NULL; } + if (osmo_sockaddr_str_to_osa(ac->cn_rtp, &cn_rtp_addr) < 0) { + LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP IP-Address\n"); + return NULL; + } + use_x213_nsap = (ac->rab_assign_addr_enc == NSAP_ADDR_ENC_X213); LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "RAB Assignment: rab_id=%d, rtp=" OSMO_SOCKADDR_STR_FMT ", use_x213_nsap=%d\n", rab_id, OSMO_SOCKADDR_STR_FMT_ARGS(ac->cn_rtp), use_x213_nsap); - msg = ranap_new_msg_rab_assign_voice(rab_id, cn_rtp_ip, ac->cn_rtp->port, use_x213_nsap); + msg = ranap_new_msg_rab_assign_voice2(rab_id, &cn_rtp_addr, use_x213_nsap); + if (!msg) { + LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, + "Error during RAB Assignment: Encoding failed rab_id=%d, rtp=" + OSMO_SOCKADDR_STR_FMT ", use_x213_nsap=%d\n", + rab_id, OSMO_SOCKADDR_STR_FMT_ARGS(ac->cn_rtp), use_x213_nsap); + return NULL; + } msg->l2h = msg->data; return msg; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?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: I23298235f4457bd556d2291d81c4aed3f009af0f Gerrit-Change-Number: 43259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: iu: Fix encoding of IPv6 RTP address in RAB Ass Req
by pespin 19 Aug '26

19 Aug '26

Attention is currently required from: fixeria, lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email ) Change subject: iu: Fix encoding of IPv6 RTP address in RAB Ass Req ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?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: I23298235f4457bd556d2291d81c4aed3f009af0f Gerrit-Change-Number: 43259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:32:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: IPA: Start (and stop) IPAd from test cases
by dexter 19 Aug '26

19 Aug '26

Attention is currently required from: jolly. dexter has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43268?usp=email ) Change subject: IPA: Start (and stop) IPAd from test cases ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File ipad/ipad/nvstate.bin: PS1: We need to generate nvstate.bin dynamically before each testrun. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43268?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I178f8e8750bcd8e1ddbe9a16c615be4bb3e64c1c Gerrit-Change-Number: 43268 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:32:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in simtrace2[master]: Add osmo_apdu_segment_in2() to ensure correct parsing of GP GET DATA
by lynxis lazus 19 Aug '26

19 Aug '26

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/43185?usp=email ) Change subject: Add osmo_apdu_segment_in2() to ensure correct parsing of GP GET DATA ...................................................................... Add osmo_apdu_segment_in2() to ensure correct parsing of GP GET DATA osmo_apdu_segment_in() doesn't have the context of the previous APDU, for nearly all calls this is fine, except for GP GET DATA, which can be a case 2 or case 4 APDU. GP GET DATA defines the Le field as 0x00 which is used by osmo_apdu_segment_in to detect if it is a case 2 or case 4. However a card can respond with the SW 6cXX, which means the previous command must be resend with a Le field XX, which got misinterpreted by the osmo_apdu_segment_in() as a case 4 resulting in a timeout waiting for more data. Modem <-> Card 81cadf2000 -> <- 6c0b 81cadf200b -> -- Simtrace waits for more data because it wrongly decodes it as APDU case 4 instead of case 2. Related: SYS#8147 Change-Id: Ie238662e7e6a10dd4283ede0c8d8d73bc375c247 --- M TODO-RELEASE M host/Makefile.am M host/configure.ac M host/include/osmocom/simtrace2/apdu_dispatch.h M host/lib/apdu_dispatch.c A host/tests/Makefile.am A host/tests/apdu_dispatch/Makefile.am A host/tests/apdu_dispatch/apdu_dispatch_test.c A host/tests/apdu_dispatch/apdu_dispatch_test.ok A host/tests/testsuite.at 10 files changed, 197 insertions(+), 1 deletion(-) Approvals: dexter: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..5922210 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-simtrace2 added osmo_apdu_segment_in2() diff --git a/host/Makefile.am b/host/Makefile.am index 338a46b..465a4e0 100644 --- a/host/Makefile.am +++ b/host/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include lib src contrib #tests examples doc +SUBDIRS = include lib src contrib tests # examples doc EXTRA_DIST = .version diff --git a/host/configure.ac b/host/configure.ac index 83a2b23..84b4147 100644 --- a/host/configure.ac +++ b/host/configure.ac @@ -100,4 +100,6 @@ src/Makefile lib/Makefile contrib/Makefile + tests/Makefile + tests/apdu_dispatch/Makefile Makefile) diff --git a/host/include/osmocom/simtrace2/apdu_dispatch.h b/host/include/osmocom/simtrace2/apdu_dispatch.h index 62ff762..f3c0ada 100644 --- a/host/include/osmocom/simtrace2/apdu_dispatch.h +++ b/host/include/osmocom/simtrace2/apdu_dispatch.h @@ -45,3 +45,6 @@ int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu); + +int osmo_apdu_segment_in2(struct osmo_apdu_context *ac, struct osmo_apdu_context *prev_ac, + const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu); diff --git a/host/lib/apdu_dispatch.c b/host/lib/apdu_dispatch.c index f2fa64e..8233507 100644 --- a/host/lib/apdu_dispatch.c +++ b/host/lib/apdu_dispatch.c @@ -78,14 +78,52 @@ int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu) { + return osmo_apdu_segment_in2(ac, NULL, apdu_buf, apdu_len, new_apdu); +} + +/*! \brief input function for APDU segmentation + * \param ac APDU context across successive calls + * \param prev_ac Previous APDU context across successive calls + * \param[in] apdu_buf APDU input data buffer + * \param[in] apdu_len Length of apdu_buf + * \param[in] new_apdu Is this the beginning of a new APDU? + * + * The function returns APDU_ACT_TX_CAPDU_TO_CARD once there is + * sufficient data of the APDU received to transmit the command-APDU to + * the actual card. + * + * The function returns APDU_ACT_RX_MORE_CAPDU_FROM_READER when there + * is more data to be received from the card reader (GSM Phone). + */ +int osmo_apdu_segment_in2(struct osmo_apdu_context *ac, struct osmo_apdu_context *prev_ac, + const uint8_t *apdu_buf, unsigned int apdu_len, + bool new_apdu) +{ int rc = 0; if (new_apdu) { + if (prev_ac) + memcpy(prev_ac, ac, sizeof(*ac)); /* initialize the apdu context structure */ memset(ac, 0, sizeof(*ac)); /* copy APDU header over */ memcpy(&ac->hdr, apdu_buf, sizeof(ac->hdr)); ac->apdu_case = osim_determine_apdu_case(&osim_uicc_sim_cic_profile, apdu_buf); + + /* Corner case when card returns SW 6CXX (resend previous command with Le = XX). + * Especial GP APDU defines Le to be 0x00, except if card returned SW 6cXX, + * Le must be set to XX. osim_determine_apdu_case() might return the wrong + * APDU case because osim_determine_apdu_case() uses the Le field to determine if the APDU + */ + if (prev_ac && prev_ac->sw[0] == 0x6c && /* check if Le was invalid and must be set to sw[1] */ + (prev_ac->apdu_case >= 1 && prev_ac->apdu_case < 4) && /* handling only valid for apdu case 1..3 */ + ac->hdr.cla == prev_ac->hdr.cla && /* check if CLA, INS, P1, P2 are equal */ + ac->hdr.ins == prev_ac->hdr.ins && + ac->hdr.p1 == prev_ac->hdr.p1 && + ac->hdr.p2 == prev_ac->hdr.p2) { + ac->apdu_case = prev_ac->apdu_case; + } + switch (ac->apdu_case) { case 1: /* P3 == 0, No Lc/Le */ ac->le.tot = ac->lc.tot = 0; diff --git a/host/tests/Makefile.am b/host/tests/Makefile.am new file mode 100644 index 0000000..e58a286 --- /dev/null +++ b/host/tests/Makefile.am @@ -0,0 +1,40 @@ +SUBDIRS = apdu_dispatch + +# The `:;' works around a Bash 3.2 bug when the output is not writeable. +$(srcdir)/package.m4: $(top_srcdir)/configure.ac + :;{ \ + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME],' && \ + echo ' [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME],' && \ + echo ' [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION],' && \ + echo ' [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING],' && \ + echo ' [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ + echo ' [$(PACKAGE_BUGREPORT)])'; \ + echo 'm4_define([AT_PACKAGE_URL],' && \ + echo ' [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4' + +EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) +TESTSUITE = $(srcdir)/testsuite +DISTCLEANFILES = atconfig + +check-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + +installcheck-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ + $(TESTSUITEFLAGS) + +clean-local: + test ! -f '$(TESTSUITE)' || \ + $(SHELL) '$(TESTSUITE)' --clean + +AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 + $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + mv $@.tmp $@ diff --git a/host/tests/apdu_dispatch/Makefile.am b/host/tests/apdu_dispatch/Makefile.am new file mode 100644 index 0000000..06a07b5 --- /dev/null +++ b/host/tests/apdu_dispatch/Makefile.am @@ -0,0 +1,13 @@ +AM_LDFLAGS = -no-install +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS=-Wall $(LIBOSMONETIF_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) +LDADD = $(top_builddir)/lib/.libs/libosmo-simtrace2.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) + +EXTRA_DIST = \ + apdu_dispatch_test.ok \ + $(NULL) + +check_PROGRAMS = apdu_dispatch_test + +apdu_dispatch_test_SOURCES = apdu_dispatch_test.c diff --git a/host/tests/apdu_dispatch/apdu_dispatch_test.c b/host/tests/apdu_dispatch/apdu_dispatch_test.c new file mode 100644 index 0000000..280736f --- /dev/null +++ b/host/tests/apdu_dispatch/apdu_dispatch_test.c @@ -0,0 +1,83 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdint.h> + +#include <osmocom/simtrace2/apdu_dispatch.h> + +const uint8_t get_data_c2_ca[] = { 0x81, 0xCA, 0x00, 0x5A, 0x00 }; +const uint8_t get_data_c2_cb[] = { 0x81, 0xCB, 0x00, 0x5A, 0x00 }; + +/* teset data for 6cXX test */ +const uint8_t get_data_c2_ca_le_23[] = { 0x81, 0xCA, 0x00, 0x5A, 0x23 }; +const uint8_t get_data_c2_cb_le_23[] = { 0x81, 0xCb, 0x00, 0x5A, 0x23 }; + +#define APDU_SEGMENT_IN(apdu, exp_rc) \ + do { \ + memset(&ac, 0, sizeof(ac)); \ + printf("Testing " #apdu "\n"); \ + int rc = osmo_apdu_segment_in(&ac, apdu, ARRAY_SIZE(apdu), true); \ + if (rc != exp_rc) \ + printf("%d (actual) != %d (expected)\n", rc, exp_rc);\ + OSMO_ASSERT(rc == exp_rc); \ + } while (0) + +#define APDU_SEGMENT_IN2(apdu, exp_rc) \ + do { \ + memset(&ac, 0, sizeof(ac)); \ + memset(&prev_ac, 0, sizeof(prev_ac)); \ + printf("Testing " #apdu "\n"); \ + int rc = osmo_apdu_segment_in2(&ac, &prev_ac, apdu, ARRAY_SIZE(apdu), true); \ + if (rc != exp_rc) \ + printf("%d (actual) != %d (expected)\n", rc, exp_rc);\ + OSMO_ASSERT(rc == exp_rc); \ + } while (0) + +void test_apdu_dispatch_simple(void) +{ + struct osmo_apdu_context ac, prev_ac; + APDU_SEGMENT_IN(get_data_c2_ca, APDU_ACT_TX_CAPDU_TO_CARD); + APDU_SEGMENT_IN(get_data_c2_cb, APDU_ACT_TX_CAPDU_TO_CARD); + + APDU_SEGMENT_IN2(get_data_c2_ca, APDU_ACT_TX_CAPDU_TO_CARD); + APDU_SEGMENT_IN2(get_data_c2_cb, APDU_ACT_TX_CAPDU_TO_CARD); +} + +void test_apdu_dispatch_context(void) +{ + struct osmo_apdu_context ac, prev_ac; + int rc; + + printf("Testing GET DATA / 0xCA with SW 6Cxx\n"); + memset(&ac, 0, sizeof(ac)); + memset(&prev_ac, 0, sizeof(prev_ac)); + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_ca, ARRAY_SIZE(get_data_c2_ca), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) + ac.sw[0] = 0x6c; + ac.sw[1] = 0x23; + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_ca_le_23, ARRAY_SIZE(get_data_c2_ca_le_23), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) + + printf("Testing GET DATA / 0xCB with SW 6Cxx\n"); + memset(&ac, 0, sizeof(ac)); + memset(&prev_ac, 0, sizeof(prev_ac)); + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_cb, ARRAY_SIZE(get_data_c2_cb), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) + ac.sw[0] = 0x6c; + ac.sw[1] = 0x23; + rc = osmo_apdu_segment_in2(&ac, &prev_ac, get_data_c2_cb_le_23, ARRAY_SIZE(get_data_c2_cb_le_23), 1); + OSMO_ASSERT(rc == APDU_ACT_TX_CAPDU_TO_CARD); + OSMO_ASSERT(ac.apdu_case == 2) +} + +int main(int argc, char **argv) +{ + test_apdu_dispatch_simple(); + test_apdu_dispatch_context(); + + printf("All tests passed.\n"); + return 0; +} diff --git a/host/tests/apdu_dispatch/apdu_dispatch_test.ok b/host/tests/apdu_dispatch/apdu_dispatch_test.ok new file mode 100644 index 0000000..108450f --- /dev/null +++ b/host/tests/apdu_dispatch/apdu_dispatch_test.ok @@ -0,0 +1,7 @@ +Testing get_data_c2_ca +Testing get_data_c2_cb +Testing get_data_c2_ca +Testing get_data_c2_cb +Testing GET DATA / 0xCA with SW 6Cxx +Testing GET DATA / 0xCB with SW 6Cxx +All tests passed. diff --git a/host/tests/testsuite.at b/host/tests/testsuite.at new file mode 100644 index 0000000..22fcdc4 --- /dev/null +++ b/host/tests/testsuite.at @@ -0,0 +1,9 @@ +AT_INIT +AT_BANNER([Regression tests.]) + +AT_SETUP([apdu_dispatch]) +AT_KEYWORDS([apdu_dispatch]) +cat $abs_srcdir/apdu_dispatch/apdu_dispatch_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/apdu_dispatch/apdu_dispatch_test], [], [expout], [ignore]) +AT_CLEANUP + -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43185?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie238662e7e6a10dd4283ede0c8d8d73bc375c247 Gerrit-Change-Number: 43185 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-msc[master]: iu: Fix encoding of IPv6 RTP address in RAB Ass Req
by pespin 19 Aug '26

19 Aug '26

Attention is currently required from: fixeria, lynxis lazus, osmith, pespin. Hello Jenkins Builder, fixeria, lynxis lazus, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: iu: Fix encoding of IPv6 RTP address in RAB Ass Req ...................................................................... iu: Fix encoding of IPv6 RTP address in RAB Ass Req Use the newly added ranap_new_msg_rab_assign_voice2() API from osmo-iuh, which allows passing a struct osmo_sockaddr hence supporting IPv6. This way we get rid of the use of deprecated inet_addr() API. Also make sure to avoid crashing if the function fails (return NULL). Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f --- M TODO-RELEASE M src/libmsc/ran_msg_iu.c 2 files changed, 16 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/43259/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?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: I23298235f4457bd556d2291d81c4aed3f009af0f Gerrit-Change-Number: 43259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-sgsn[master]: ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43260?usp=email ) Change subject: ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr ...................................................................... ranap: Avoid write buffer overflow on GTPv1U outter IPv6 addr If an IPv6 address was passed by libgtp in pdp->lib->gsnru, sgsn_pdp_ctx_iu_rab_activate() would write 16 bytes to an uint32_t variable, overflowing it and writing further on the stack. Fix it by simply using the new osmo-iuh API ranap_new_msg_rab_assign_data2() which expects an osmo_sockaddr instead of a uint32_t (which then supports IPv6 too). Using the new APIs to convert the GSNA to an osmo_sockaddr and passing it to osmo-iuh new API then we make sure there's no buffer overflow anymore. Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Related: OS#7060 Reported-By: Adam Bedard <adam.bedard(a)gmail.com> Change-Id: I3beb8afcabad8d74b12a6aad845b455ed95761d4 --- M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/gtp.h M src/sgsn/gprs_ranap.c M src/sgsn/pdpctx.c 4 files changed, 29 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h index b959b57..9185b39 100644 --- a/include/osmocom/sgsn/gprs_ranap.h +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -3,6 +3,7 @@ #include "config.h" #include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> #ifdef BUILD_IU #include <osmocom/ranap/ranap_ies_defs.h> @@ -26,7 +27,9 @@ int sgsn_ranap_iu_tx(struct msgb *msg, uint8_t sapi); int sgsn_ranap_iu_tx_rab_ps_ass_req(struct ranap_ue_conn_ctx *ue_ctx, - uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei); + uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei); int sgsn_ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, int send_ck, int new_key); int sgsn_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi); diff --git a/include/osmocom/sgsn/gtp.h b/include/osmocom/sgsn/gtp.h index 0f77a18..aba4f0a 100644 --- a/include/osmocom/sgsn/gtp.h +++ b/include/osmocom/sgsn/gtp.h @@ -3,9 +3,12 @@ #include <stddef.h> #include <stdint.h> +#include <osmocom/core/socket.h> #include <osmocom/gsm/tlv.h> #include <osmocom/gprs/gprs_bssgp_rim.h> +#include <osmocom/gtp/pdp.h> + struct gprs_ra_id; struct sgsn_instance; struct sgsn_ggsn_ctx; @@ -27,3 +30,8 @@ struct msgb *msg, uint32_t npdu_len, uint8_t *npdu); int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx); int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx); + +static inline int gsna_to_osa(struct osmo_sockaddr *dst, const struct ul16_t *in) +{ + return osmo_sockaddr_from_octets(dst, &in->v[0], in->l); +} diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 1cdb72b..4445235 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -252,16 +252,19 @@ } int sgsn_ranap_iu_tx_rab_ps_ass_req(struct ranap_ue_conn_ctx *ue_ctx, - uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei) + uint8_t rab_id, + const struct osmo_sockaddr *gtp_addr, + uint32_t gtp_tei) { struct msgb *msg; bool use_x213_nsap = (ue_ctx->rab_assign_addr_enc == RANAP_NSAP_ADDR_ENC_X213); + char ip_str[INET6_ADDRSTRLEN]; LOGP(DRANAP, LOGL_DEBUG, - "Assigning RAB: rab_id=%u, ggsn_ip=%x, teid_gn=%x, use_x213_nsap=%d\n", - rab_id, gtp_ip, gtp_tei, use_x213_nsap); + "Assigning RAB: rab_id=%u, ggsn_ip=%s, teid_gn=%x, use_x213_nsap=%d\n", + rab_id, osmo_sockaddr_ntop(&gtp_addr->u.sa, ip_str), gtp_tei, use_x213_nsap); - msg = ranap_new_msg_rab_assign_data(rab_id, gtp_ip, gtp_tei, use_x213_nsap); + msg = ranap_new_msg_rab_assign_data2(rab_id, gtp_addr, gtp_tei, use_x213_nsap); return sgsn_scu_iups_tx_data_req(ue_ctx->rnc->scu_iups, ue_ctx->conn_id, msg); } diff --git a/src/sgsn/pdpctx.c b/src/sgsn/pdpctx.c index 1fbddab..da825e6 100644 --- a/src/sgsn/pdpctx.c +++ b/src/sgsn/pdpctx.c @@ -173,19 +173,23 @@ { struct sgsn_mm_ctx *mm = pdp->mm; struct ranap_ue_conn_ctx *ue_ctx; - uint32_t ggsn_ip; + struct osmo_sockaddr gtp_addr; + char ip_str[INET6_ADDRSTRLEN]; OSMO_ASSERT(mm->ran_type == MM_CTX_T_UTRAN_Iu); ue_ctx = mm->iu.ue_ctx; /* Get the IP address for ggsn user plane */ - memcpy(&ggsn_ip, pdp->lib->gsnru.v, pdp->lib->gsnru.l); - ggsn_ip = htonl(ggsn_ip); + if (gsna_to_osa(&gtp_addr, &pdp->lib->gsnru) < 0) { + LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, teid_gn=%x: Invalid GTP1U address! len=%u\n", + rab_id, pdp->lib->teid_gn, pdp->lib->gsnru.l); + return -EINVAL; + } - LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, ggsn_ip=%x, teid_gn=%x\n", - rab_id, ggsn_ip, pdp->lib->teid_gn); + LOGPDPCTXP(LOGL_INFO, pdp, "Activate RAB: rab_id=%u, ggsn_ip=%s, teid_gn=%x\n", + rab_id, osmo_sockaddr_ntop(&gtp_addr.u.sa, ip_str), pdp->lib->teid_gn); - return sgsn_ranap_iu_tx_rab_ps_ass_req(ue_ctx, rab_id, ggsn_ip, pdp->lib->teid_gn); + return sgsn_ranap_iu_tx_rab_ps_ass_req(ue_ctx, rab_id, &gtp_addr, pdp->lib->teid_gn); } int sgsn_pdp_ctx_iu_rab_deactivate(struct sgsn_pdp_ctx *pdp, uint8_t rab_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43260?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3beb8afcabad8d74b12a6aad845b455ed95761d4 Gerrit-Change-Number: 43260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026