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

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

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33776 ) Change subject: scripts/kernel-test/run-qemu: update qemu args ...................................................................... scripts/kernel-test/run-qemu: update qemu args Fix these warnings: warning: short-form boolean option 'server' deprecated warning: short-form boolean option 'nowait' deprecated Change-Id: Iba84d8e61c2d9cbd687d803066db0c04aca9f805 --- M scripts/kernel-test/run-qemu.sh 1 file changed, 16 insertions(+), 2 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 5eb7ead..0c4fa26 100755 --- a/scripts/kernel-test/run-qemu.sh +++ b/scripts/kernel-test/run-qemu.sh @@ -25,13 +25,13 @@ -smp 1 \ -m 512M \ -no-user-config -nodefaults -display none \ - -gdb unix:/cache/kernel-test/gdb.pipe,server,nowait \ + -gdb unix:/cache/kernel-test/gdb.pipe,server=on,wait=off \ -no-reboot \ -kernel /cache/kernel-test/linux \ -initrd /cache/kernel-test/initrd \ -append "${KERNEL_CMDLINE}" \ -serial stdio \ - -chardev socket,id=charserial1,path=/cache/kernel-test/gdb-serial.pipe,server,nowait \ + -chardev socket,id=charserial1,path=/cache/kernel-test/gdb-serial.pipe,server=on,wait=off \ -device isa-serial,chardev=charserial1,id=serial1 \ -netdev tap,id=nettest,script=/kernel-test/qemu-ifup.sh,downscript=/kernel-test/qemu-ifdown.sh \ -device virtio-net-pci,netdev=nettest,mac="$(random_mac)" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iba84d8e61c2d9cbd687d803066db0c04aca9f805 Gerrit-Change-Number: 33776 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

Attention is currently required from: osmith, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33774 ) Change subject: scripts/kernel-test: adjust to usr-merge ...................................................................... Patch Set 2: Code-Review+2 -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:19:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

18 Jul '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33776 ) Change subject: scripts/kernel-test/run-qemu: update qemu args ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iba84d8e61c2d9cbd687d803066db0c04aca9f805 Gerrit-Change-Number: 33776 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:19:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

18 Jul '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33775 ) Change subject: scripts/kernel-test/run-qemu: set init=/init ...................................................................... Patch Set 2: Code-Review+2 -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:18:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

18 Jul '23

Attention is currently required from: osmith, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33774 ) Change subject: scripts/kernel-test: adjust to usr-merge ...................................................................... Patch Set 2: Code-Review+1 -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:18:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

18 Jul '23

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33774 ) Change subject: scripts/kernel-test: adjust to usr-merge ...................................................................... Patch Set 1: (1 comment) This change is ready for review. Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/33774/comment/d56c4ff5_e93… PS1, Line 9: In debian bookworm, /bin has been moved to /usr/bin > Oh wow, that would break lots of scripts having `/bin/...` in their shebang. […] Yes. First I thought I could just change the shebang, but then it breaks elsewhere, osmo-ggsn cannot be executed because the shared libraries don't end up in the proper paths. I've made a new version of the patch that properly copies everything to the /usr/... paths and adds the same symlinks. -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 12:16:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-e1d[master]: e1d-ts-pipe: Assert that osmo_fd_register() succeeds
by laforge 18 Jul '23

18 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/33785 ) Change subject: e1d-ts-pipe: Assert that osmo_fd_register() succeeds ...................................................................... e1d-ts-pipe: Assert that osmo_fd_register() succeeds Fixes: CID#307497: Unchecked return value (CHECKED_RETURN) Change-Id: Ie2abd580e37d7d58c507d12105ec2130fb533ed9 --- M src/e1d-ts-pipe.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/85/33785/1 diff --git a/src/e1d-ts-pipe.c b/src/e1d-ts-pipe.c index 99b7c55..45cafb8 100644 --- a/src/e1d-ts-pipe.c +++ b/src/e1d-ts-pipe.c @@ -219,7 +219,7 @@ exit(2); osmo_fd_setup(&ts_ofd, tsfd, OSMO_FD_READ|OSMO_FD_WRITE, ts_fd_cb, NULL, 0); - osmo_fd_register(&ts_ofd); + OSMO_ASSERT(osmo_fd_register(&ts_ofd) == 0); set_nonblock(infd); set_nonblock(outfd); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/33785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie2abd580e37d7d58c507d12105ec2130fb533ed9 Gerrit-Change-Number: 33785 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-e1d[master]: octoi: Fix missing check of osmo_fsm_register() return value
by laforge 18 Jul '23

18 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/33784 ) Change subject: octoi: Fix missing check of osmo_fsm_register() return value ...................................................................... octoi: Fix missing check of osmo_fsm_register() return value Fixes: CID#307511: Unchecked return value (CHECKED_RETURN) Change-Id: Ia474a6c078f1aec3d04be494a888ffe87b199f5a --- M src/octoi/octoi.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/84/33784/1 diff --git a/src/octoi/octoi.c b/src/octoi/octoi.c index 6e4b8f9..1c0a6e7 100644 --- a/src/octoi/octoi.c +++ b/src/octoi/octoi.c @@ -75,8 +75,8 @@ { OSMO_ASSERT(!g_octoi); - osmo_fsm_register(&octoi_server_fsm); - osmo_fsm_register(&octoi_client_fsm); + OSMO_ASSERT(osmo_fsm_register(&octoi_server_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&octoi_client_fsm) == 0); g_octoi = talloc_zero(ctx, struct octoi_daemon); OSMO_ASSERT(g_octoi); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/33784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia474a6c078f1aec3d04be494a888ffe87b199f5a Gerrit-Change-Number: 33784 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-e1d[master]: proto_srv: Fix file descriptor and memory leak in error paths
by laforge 18 Jul '23

18 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/33783 ) Change subject: proto_srv: Fix file descriptor and memory leak in error paths ...................................................................... proto_srv: Fix file descriptor and memory leak in error paths Fixes: CID#307517 Change-Id: I44e349eee5b0b54843762db8cadd6b9b1758faa4 --- M src/proto_srv.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/83/33783/1 diff --git a/src/proto_srv.c b/src/proto_srv.c index d6d3d17..2b85ac6 100644 --- a/src/proto_srv.c +++ b/src/proto_srv.c @@ -185,6 +185,7 @@ conn = talloc_zero(srv->ctx, struct osmo_e1dp_server_conn); if (!conn) { LOGP(DE1D, LOGL_ERROR, "Failed to create incoming connection.\n"); + close(rc); return -1; } @@ -197,6 +198,8 @@ if (osmo_fd_register(&conn->fd) != 0) { LOGP(DE1D, LOGL_ERROR, "Failed to register incoming fd.\n"); + close(conn->fd.fd); + talloc_free(conn); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/33783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I44e349eee5b0b54843762db8cadd6b9b1758faa4 Gerrit-Change-Number: 33783 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-e1d[master]: Check return code of fcntl() in several plaaces
by laforge 18 Jul '23

18 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/33782 ) Change subject: Check return code of fcntl() in several plaaces ...................................................................... Check return code of fcntl() in several plaaces Fixes: CID#307539, CID#307533 Change-Id: I46843174eb4699a59421dc3f3b900a3894c67081 --- M src/ctl.c M src/proto_clnt.c 2 files changed, 33 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/82/33782/1 diff --git a/src/ctl.c b/src/ctl.c index 54d37c5..8ed4a69 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -163,9 +163,20 @@ } int flags = fcntl(ts->fd, F_GETFL); - fcntl(ts->fd, F_SETFL, flags | O_NONBLOCK); + if (flags < 0) + goto out_err; + + ret = fcntl(ts->fd, F_SETFL, flags | O_NONBLOCK); + if (ret < 0) + goto out_err; return sd[1]; +out_err: + close(sd[0]); + close(sd[1]); + ts->fd = -1; + ts->mode = E1_TS_MODE_OFF; + return -1; } diff --git a/src/proto_clnt.c b/src/proto_clnt.c index 6c59593..93853e9 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -189,7 +189,12 @@ /* Response */ int flags = fcntl(clnt->ctl_fd.fd, F_GETFL, 0); - fcntl(clnt->ctl_fd.fd, F_SETFL, flags & ~O_NONBLOCK); + if (flags < 0) + return -EIO; + + rc = fcntl(clnt->ctl_fd.fd, F_SETFL, flags & ~O_NONBLOCK); + if (rc < 0) + goto err; while (1) { fd = -1; @@ -207,7 +212,11 @@ msgb_free(msgb); } - fcntl(clnt->ctl_fd.fd, F_SETFL, flags); + rc = fcntl(clnt->ctl_fd.fd, F_SETFL, flags); + if (rc < 0) { + rc = -EIO; + goto err; + } if (msg_hdr->type != (hdr->type | E1DP_RESP_TYPE)) { rc = -EPIPE; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/33782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I46843174eb4699a59421dc3f3b900a3894c67081 Gerrit-Change-Number: 33782 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0