December 2025 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[pespin/rel-1.12.0]: gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called mult...
by osmith 18 Dec '25

18 Dec '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41710?usp=email ) Change subject: gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41710?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: pespin/rel-1.12.0 Gerrit-Change-Id: I7af5a6c7d64954ee2cc013711702b846dfaa02b1 Gerrit-Change-Number: 41710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 13:39:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[pespin/rel-1.12.0]: vty: assert in optional param followed by optional-multi-choice param...
by osmith 18 Dec '25

18 Dec '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41709?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Fix [2/2] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41709?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: pespin/rel-1.12.0 Gerrit-Change-Id: I4c184db53bec28ab42bcd45e033733d850eea5d2 Gerrit-Change-Number: 41709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 13:38:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[pespin/rel-1.12.0]: vty: assert in optional param followed by optional-multi-choice param...
by osmith 18 Dec '25

18 Dec '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41708?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41708?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: pespin/rel-1.12.0 Gerrit-Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 41708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 13:38:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[pespin/rel-1.12.0]: gsmtap_util: Fix fds not closed in ofd_wq_mode=0
by osmith 18 Dec '25

18 Dec '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41707?usp=email ) Change subject: gsmtap_util: Fix fds not closed in ofd_wq_mode=0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41707?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: pespin/rel-1.12.0 Gerrit-Change-Id: I55fd51066d22261cf89fbf9501bec3af743a641d Gerrit-Change-Number: 41707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 13:38:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[pespin/rel-1.12.0]: gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called mult...
by pespin 18 Dec '25

18 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41710?usp=email ) Change subject: gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times ...................................................................... gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times gti->sink_fd could leak if gsmtap_source_add_sink() was called multiple times. Also if gsmtap_source_add_sink_fd() failed, rc != -1 was returned and hence a close() on a wrong fd would be attempted. This commit fixes both issues, making the whole sink_fd field much more robust. Change-Id: I7af5a6c7d64954ee2cc013711702b846dfaa02b1 (cherry picked from commit 85112c4911252412f0d127f01bde92794e232d00) --- M src/core/gsmtap_util.c 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/41710/1 diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index 35bbf77..9b9c3b6 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -435,7 +435,7 @@ /*! Add a local sink to an existing GSMTAP source and return fd * \param[in] gti existing GSMTAP source - * \returns file descriptor of locally bound receive socket + * \returns file descriptor of locally bound receive socket; negative on error * * In case the GSMTAP socket is connected to a local destination * IP/port, this function creates a corresponding receiving socket @@ -450,7 +450,15 @@ */ int gsmtap_source_add_sink(struct gsmtap_inst *gti) { - return gti->sink_fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti)); + int rc; + + if (gti->sink_fd >= 0) + return -EALREADY; + + rc = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti)); + if (rc >= 0) + gti->sink_fd = rc; + return rc; } /* Registered in Osmo IO as a no-op to set the write callback. */ @@ -535,7 +543,7 @@ close(gti->wq.bfd.fd); - if (gti->sink_fd != -1) { + if (gti->sink_fd >= 0) { close(gti->sink_fd); gti->sink_fd = -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41710?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.12.0 Gerrit-Change-Id: I7af5a6c7d64954ee2cc013711702b846dfaa02b1 Gerrit-Change-Number: 41710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[pespin/rel-1.12.0]: Bump version: 1.12.0.12-88a1-dirty → 1.12.1
by pespin 18 Dec '25

18 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41711?usp=email ) Change subject: Bump version: 1.12.0.12-88a1-dirty → 1.12.1 ...................................................................... Bump version: 1.12.0.12-88a1-dirty → 1.12.1 Change-Id: I11cf70e4d82bab74ff51df402df00a060be77ebf --- M debian/changelog M src/core/Makefile.am M src/vty/Makefile.am 3 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/41711/1 diff --git a/debian/changelog b/debian/changelog index b4d258a..42045b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libosmocore (1.12.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * gsmtap_util: Fix fds not closed in ofd_wq_mode=0 + * vty: assert in optional param followed by optional-multi-choice param: Fix [2/2] + * gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times + + [ Vadim Yanitskiy ] + * vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] + + -- Pau Espin Pedrol <pespin(a)sysmocom.de> Thu, 18 Dec 2025 14:34:32 +0100 + libosmocore (1.12.0) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 0b756da..d670168 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=24:0:2 +LIBVERSION=24:1:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index ecdd050..ba26f14 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=13:3:0 +LIBVERSION=13:4:0 AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41711?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.12.0 Gerrit-Change-Id: I11cf70e4d82bab74ff51df402df00a060be77ebf Gerrit-Change-Number: 41711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[pespin/rel-1.12.0]: gsmtap_util: Fix fds not closed in ofd_wq_mode=0
by pespin 18 Dec '25

18 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41707?usp=email ) Change subject: gsmtap_util: Fix fds not closed in ofd_wq_mode=0 ...................................................................... gsmtap_util: Fix fds not closed in ofd_wq_mode=0 Change-Id: I55fd51066d22261cf89fbf9501bec3af743a641d (cherry picked from commit 16bf95ea21d7c8db6d07aaf5d161bf5a1d9d7915) --- M src/core/gsmtap_util.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/41707/1 diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index 62d3ffa..35bbf77 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -529,14 +529,15 @@ if (!gti) return; - if (gti->osmo_io_mode) { + if (gti->osmo_io_mode) osmo_iofd_free(gti->out); + else + close(gti->wq.bfd.fd); - if (gti->sink_fd != -1) { - close(gti->sink_fd); - gti->sink_fd = -1; - } + if (gti->sink_fd != -1) { + close(gti->sink_fd); + gti->sink_fd = -1; } talloc_free(gti); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41707?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.12.0 Gerrit-Change-Id: I55fd51066d22261cf89fbf9501bec3af743a641d Gerrit-Change-Number: 41707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[pespin/rel-1.12.0]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41708?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] ...................................................................... vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] The test added below makes cmd_make_descvec() assert in "OSMO_ASSERT(multiple);" line, so it's expected to fail during CI. Follow-up patch provides a fixes for it. Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Related: b55f4d2df21b966c3953264d8961f259814f4650 Related: OS#6360 (cherry picked from commit aafa7c02edba4a215fec9d01c48d21c3a1addc1d) --- M tests/vty/vty_transcript_test.c M tests/vty/vty_transcript_test.vty 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/41708/1 diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c index 5602c50..5f8157a 100644 --- a/tests/vty/vty_transcript_test.c +++ b/tests/vty/vty_transcript_test.c @@ -207,6 +207,17 @@ return CMD_SUCCESS; } +DEFUN(multi3, multi3_cmd, + "multi3 (foo|bar) [(one|two|three)]", + "multi3 test command\n" "foo\nbar\n" "1\n2\n3\n") +{ + OSMO_ASSERT(argc > 0); + vty_out(vty, "ok argc=%d %s%s%s%s", argc, argv[0], + argc > 1 ? " " : "", argc > 1 ? argv[1] : "", + VTY_NEWLINE); + return CMD_SUCCESS; +} + #define X(f) (1 << f) enum { @@ -380,6 +391,7 @@ install_element_ve(&multi0_cmd); install_element_ve(&multi1_cmd); install_element_ve(&multi2_cmd); + install_element_ve(&multi3_cmd); install_element(CONFIG_NODE, &cfg_attr_test_cmd); install_node(&attr_test_node, NULL); diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index 7df2a60..a1c044a 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -3,6 +3,7 @@ multi0 (one|two|three) multi1 ([one]|[two]|[three]) multi2 [(one|two|three)] + multi3 (foo|bar) [(one|two|three)] vty_transcript_test> multi0 ? one 1 @@ -67,6 +68,27 @@ vty_transcript_test> multi2 ok argc=0 +vty_transcript_test> multi3 ? + foo foo + bar bar + +vty_transcript_test> multi3 foo ? + [one] 1 + [two] 2 + [three] 3 + +vty_transcript_test> multi3 foo +ok argc=1 foo + +vty_transcript_test> multi3 bar +ok argc=1 bar + +vty_transcript_test> multi3 foo one +ok argc=2 foo one + +vty_transcript_test> multi3 bar three +ok argc=2 bar three + vty_transcript_test> multi0 thr ok argc=1 three @@ -76,6 +98,9 @@ vty_transcript_test> multi2 t % Ambiguous command. +vty_transcript_test> multi3 foo t +% Ambiguous command. + vty_transcript_test> single0 one ok argc=1 one -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41708?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.12.0 Gerrit-Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 41708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in libosmocore[pespin/rel-1.12.0]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41709?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Fix [2/2] ...................................................................... vty: assert in optional param followed by optional-multi-choice param: Fix [2/2] in cmd_make_descr, cp during the asserting iteration looks like this: (gdb) print cp $18 = 0x555555c1939d ") [(one|two|three)" As a result, first multiple is set to 0 and later on logic was missing for this specific case. Change-Id: I4c184db53bec28ab42bcd45e033733d850eea5d2 Fixes: b55f4d2df21b966c3953264d8961f259814f4650 Related: OS#6360 (cherry picked from commit 2e41c4301ece14cbd9d22896a079619ba080200a) --- M src/vty/command.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/41709/1 diff --git a/src/vty/command.c b/src/vty/command.c index 8594290..c1bda8a 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -443,6 +443,12 @@ while (isspace((int)*cp) && *cp != '\0') cp++; + /* Explicitly detect optional multi-choice braces like [(one|two)]. */ + if (cp[0] == '[' && cp[1] == '(') { + optional_brace = 1; + cp++; + } + if (*cp == '(') { multiple = 1; cp++; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41709?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.12.0 Gerrit-Change-Id: I4c184db53bec28ab42bcd45e033733d850eea5d2 Gerrit-Change-Number: 41709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called mult...
by pespin 18 Dec '25

18 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41706?usp=email ) Change subject: gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times ...................................................................... gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times gti->sink_fd could leak if gsmtap_source_add_sink() was called multiple times. Also if gsmtap_source_add_sink_fd() failed, rc != -1 was returned and hence a close() on a wrong fd would be attempted. This commit fixes both issues, making the whole sink_fd field much more robust. Change-Id: I7af5a6c7d64954ee2cc013711702b846dfaa02b1 --- M src/core/gsmtap_util.c 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index f1a2abf..903821d 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -421,7 +421,7 @@ /*! Add a local sink to an existing GSMTAP source and return fd * \param[in] gti existing GSMTAP source - * \returns file descriptor of locally bound receive socket + * \returns file descriptor of locally bound receive socket; negative on error * * In case the GSMTAP socket is connected to a local destination * IP/port, this function creates a corresponding receiving socket @@ -436,7 +436,15 @@ */ int gsmtap_source_add_sink(struct gsmtap_inst *gti) { - return gti->sink_fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti)); + int rc; + + if (gti->sink_fd >= 0) + return -EALREADY; + + rc = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti)); + if (rc >= 0) + gti->sink_fd = rc; + return rc; } /* Registered in Osmo IO as a no-op to set the write callback. */ @@ -520,7 +528,7 @@ close(gti->source_fd); - if (gti->sink_fd != -1) { + if (gti->sink_fd >= 0) { close(gti->sink_fd); gti->sink_fd = -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41706?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: I7af5a6c7d64954ee2cc013711702b846dfaa02b1 Gerrit-Change-Number: 41706 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0