July 2023 - gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest
by osmith 18 Jul '23

18 Jul '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33781 ) Change subject: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: we don't need to add the extra variable (and remove it again later on) if using "if (Misc_Helpers.f_osmo_repo_is("nightly")) {" in ttcn3 code -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1a933795ffef3cea97fcf34b1c513e71f3256c83 Gerrit-Change-Number: 33781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:33:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce module parameter mp_validate_talloc_asn1
by osmith 18 Jul '23

18 Jul '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 ) Change subject: hnbgw: Introduce module parameter mp_validate_talloc_asn1 ...................................................................... Patch Set 1: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780/comment/85cb8d4e_7b9f… PS1, Line 465: if (mp_validate_talloc_asn1) { it would also work without adding a new variable: ``` if (Misc_Helpers.f_osmo_repo_is("nightly")) { ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5c18cf2d6797bcf0bef13d71ab0b69f1403b474f Gerrit-Change-Number: 33780 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:30:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: scripts/kernel-test: fixup for initrd_add_file
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33786 ) Change subject: scripts/kernel-test: fixup for initrd_add_file ...................................................................... scripts/kernel-test: fixup for initrd_add_file The previous versions happened to work too in my testing with osmo-ggsn. Use the correct loop variable. Fixes: 0660fc4e ("scripts/kernel-test: adjust to usr-merge") Change-Id: I0c0ca91116a8cd156b185bb53512371bbcb76515 --- M scripts/kernel-test/initrd-build.sh 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/86/33786/1 diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh index 6c17ffa..d942719 100755 --- a/scripts/kernel-test/initrd-build.sh +++ b/scripts/kernel-test/initrd-build.sh @@ -10,10 +10,10 @@ for i in "$@"; do case "$i" in /bin/*|/sbin/*|/lib/*|/lib64/*) - cp -a --parents "$@" /tmp/initrd/usr + cp -a --parents "$i" /tmp/initrd/usr ;; *) - cp -a --parents "$@" /tmp/initrd + cp -a --parents "$i" /tmp/initrd ;; esac done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0c0ca91116a8cd156b185bb53512371bbcb76515 Gerrit-Change-Number: 33786 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33781 ) Change subject: hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1a933795ffef3cea97fcf34b1c513e71f3256c83 Gerrit-Change-Number: 33781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:21:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce module parameter mp_validate_talloc_asn1
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 ) Change subject: hnbgw: Introduce module parameter mp_validate_talloc_asn1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5c18cf2d6797bcf0bef13d71ab0b69f1403b474f Gerrit-Change-Number: 33780 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:21:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-remsim[master]: user_shell: Fix unchecked return value of osmo_fd_register()
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33779 ) Change subject: user_shell: Fix unchecked return value of osmo_fd_register() ...................................................................... user_shell: Fix unchecked return value of osmo_fd_register() Fixes: CID#307519: Unchecked return value (CHECKED_RETURN) Change-Id: I68ed44464573b9a6fecd07cf13fd2d6f4a1013bb --- M src/client/user_shell.c 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/client/user_shell.c b/src/client/user_shell.c index 5d37e97..f0dcd55 100644 --- a/src/client/user_shell.c +++ b/src/client/user_shell.c @@ -170,11 +170,15 @@ int client_user_main(struct bankd_client *bc) { struct stdin_state ss; + int rc; /* register stdin file descriptor with osmocom select loop abstraction */ memset(&ss, 0, sizeof(ss)); osmo_fd_setup(&ss.ofd, fileno(stdin), OSMO_FD_READ, &stdin_fd_cb, &ss, 0); - osmo_fd_register(&ss.ofd); + rc = osmo_fd_register(&ss.ofd); + if (rc < 0) + return rc; + ss.bc = bc; while (1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I68ed44464573b9a6fecd07cf13fd2d6f4a1013bb Gerrit-Change-Number: 33779 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-remsim[master]: rspro_client_fsm: Fix integer overflow calculating re-establishment d...
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33777 ) Change subject: rspro_client_fsm: Fix integer overflow calculating re-establishment delay ...................................................................... rspro_client_fsm: Fix integer overflow calculating re-establishment delay Fixes: CID#307493: Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN) Change-Id: Ib1cca5ac0d27807936a52e0c013f0442350ecc00 --- M src/rspro_client_fsm.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 321dcf2..72176ab 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -238,7 +238,7 @@ } /* determine if we need to delay reestablishment */ - const int64_t need_ms = k_reestablish_delay_s[srvc->reestablish_delay_idx] * 1000; + const int64_t need_ms = (int64_t) k_reestablish_delay_s[srvc->reestablish_delay_idx] * 1000; int64_t delay_ms = need_ms - since_last_ms; if (delay_ms > 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib1cca5ac0d27807936a52e0c013f0442350ecc00 Gerrit-Change-Number: 33777 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix missing check of osmo_fd_register return val
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33778 ) Change subject: user_ifdhandler: Fix missing check of osmo_fd_register return val ...................................................................... user_ifdhandler: Fix missing check of osmo_fd_register return val Fixes: CID#307514: Unchecked return value (CHECKED_RETURN) Change-Id: I99d7254b6cc3bf5ead800dafabc77a965857911c --- M src/client/user_ifdhandler.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index 5e7fb7a..c6a9392 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -396,7 +396,8 @@ INIT_LLIST_HEAD(&ct->it_msgq); osmo_fd_setup(&ct->it_ofd, cfg->it_sock_fd, OSMO_FD_READ, &it_sock_fd_cb, ct, 0); - osmo_fd_register(&ct->it_ofd); + rc = osmo_fd_register(&ct->it_ofd); + OSMO_ASSERT(rc == 0); /* ensure we get properly cleaned up if cancelled */ pthread_cleanup_push(client_pthread_cleanup, ct); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I99d7254b6cc3bf5ead800dafabc77a965857911c Gerrit-Change-Number: 33778 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: scripts/kernel-test/run-qemu: set init=/init
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33775 ) Change subject: scripts/kernel-test/run-qemu: set init=/init ...................................................................... scripts/kernel-test/run-qemu: set init=/init Set init= so the kernel doesn't try to run other scripts if /init fails: [ 2.946381] Run /init as init process [ 2.948885] Failed to execute /init (error -2) [ 2.949051] Run /sbin/init as init process [ 2.949329] Run /etc/init as init process [ 2.949566] Run /bin/init as init process [ 2.949795] Run /bin/sh as init process Change-Id: I063c7625acaa15130d8361d4e944c3773c9b37c4 --- M scripts/kernel-test/run-qemu.sh 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh index 9951e94..5eb7ead 100755 --- a/scripts/kernel-test/run-qemu.sh +++ b/scripts/kernel-test/run-qemu.sh @@ -10,6 +10,7 @@ root=/dev/ram0 console=ttyS0 panic=-1 + init=/init $@ " -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I063c7625acaa15130d8361d4e944c3773c9b37c4 Gerrit-Change-Number: 33775 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[M] Change in docker-playground[master]: scripts/kernel-test: adjust to usr-merge
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33774 ) Change subject: scripts/kernel-test: adjust to usr-merge ...................................................................... scripts/kernel-test: adjust to usr-merge In debian bookworm, the /usr merge has been implemented: /bin → /usr/bin /sbin → /usr/sbin /lib → /usr/lib /lib64 → /usr/lib64 The initramfs filesystem layout is derived from the paths of the binaries and libraries in the full system. Create the same symlinks and adjust initrd_add_bin so it does not trip over the symlinks. I've also considered to change all input for initrd_add_bin to point at the /usr/… paths. But this is not possible, for example ldd/lddtree will point at libraries in /lib and /lib64, and this gets passed to initrd_add_bin. Without this patch, the init script and all binaries called from it cannot be executed. Related: OS#6057 Related: https://wiki.debian.org/UsrMerge Change-Id: I975d3af0fa88869688673936a08189de800fba29 --- M scripts/kernel-test/initrd-build.sh 1 file changed, 49 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh index cce4de8..6c17ffa 100755 --- a/scripts/kernel-test/initrd-build.sh +++ b/scripts/kernel-test/initrd-build.sh @@ -1,9 +1,22 @@ #!/bin/sh -ex -# Add one or more files to the initramfs, with parent directories +# Add one or more files to the initramfs, with parent directories. +# usr-merge: resolve symlinks for /lib -> /usr/lib etc. so "cp --parents" does +# not fail with "cp: cannot make directory '/tmp/initrd/lib': File exists" # $@: path to files initrd_add_file() { - cp -a --parents "$@" /tmp/initrd + local i + + for i in "$@"; do + case "$i" in + /bin/*|/sbin/*|/lib/*|/lib64/*) + cp -a --parents "$@" /tmp/initrd/usr + ;; + *) + cp -a --parents "$@" /tmp/initrd + ;; + esac + done } # Add kernel module files with dependencies @@ -82,10 +95,13 @@ mkdir -p /tmp/initrd cd /tmp/initrd +for dir in bin sbin lib lib64; do + ln -s usr/"$dir" "$dir" +done + mkdir -p \ dev/net \ proc \ - sbin \ sys \ tmp \ usr/bin \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I975d3af0fa88869688673936a08189de800fba29 Gerrit-Change-Number: 33774 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0