- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: pcu_sock: fix memleak
by dexter 15 Sep '22

15 Sep '22

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29360 ) Change subject: pcu_sock: fix memleak ...................................................................... pcu_sock: fix memleak pcu_sock_read() may not free the message buffer in case the recv returned errno EAGAIN. This is already fixed in osmo-bts, lets fix it in osmo-bsc as well. Related: OS#5198 Change-Id: I49eda447fc1912c1f7f25ba07331cb84decf4548 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/29360/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 45ff835..2cf1ab5 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -567,8 +567,10 @@ goto close; if (rc < 0) { - if (errno == EAGAIN) + if (errno == EAGAIN) { + msgb_free(msg); return 0; + } goto close; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I49eda447fc1912c1f7f25ba07331cb84decf4548 Gerrit-Change-Number: 29360 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: pcu_sock: check size of primitive
by dexter 15 Sep '22

15 Sep '22

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29361 ) Change subject: pcu_sock: check size of primitive ...................................................................... pcu_sock: check size of primitive The pcu_sock interface in osmo-bts does check the size of the primitives it receives. Lets do the same in osmo-bsc as well. Change-Id: I247c6f4b5a7a22d17a060a558c4ceb9221ca7351 Related: OS#5198 --- M include/osmocom/bsc/pcu_if.h M src/osmo-bsc/pcu_sock.c 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/61/29361/1 diff --git a/include/osmocom/bsc/pcu_if.h b/include/osmocom/bsc/pcu_if.h index 1f398b4..736b633 100644 --- a/include/osmocom/bsc/pcu_if.h +++ b/include/osmocom/bsc/pcu_if.h @@ -5,6 +5,8 @@ extern int pcu_direct; +#define PCUIF_HDR_SIZE ( sizeof(struct gsm_pcu_if) - sizeof(((struct gsm_pcu_if *)0)->u) ) + struct pcu_sock_state { struct gsm_network *net; struct osmo_fd listen_bfd; /* fd for listen socket */ diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 2cf1ab5..25bfc89 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -448,8 +448,17 @@ return rc; } +#define CHECK_IF_MSG_SIZE(prim_len, prim_msg) \ + do { \ + size_t _len = PCUIF_HDR_SIZE + sizeof(prim_msg); \ + if (prim_len < _len) { \ + LOGP(DPCU, LOGL_ERROR, "Received %zu bytes on PCU Socket, but primitive %s " \ + "size is %zu, discarding\n", prim_len, #prim_msg, _len); \ + return -EINVAL; \ + } \ + } while(0); static int pcu_rx(struct gsm_network *net, uint8_t msg_type, - struct gsm_pcu_if *pcu_prim) + struct gsm_pcu_if *pcu_prim, size_t prim_len) { int rc = 0; struct gsm_bts *bts; @@ -460,6 +469,7 @@ switch (msg_type) { case PCU_IF_MSG_DATA_REQ: case PCU_IF_MSG_PAG_REQ: + CHECK_IF_MSG_SIZE(prim_len, pcu_prim->u.data_req); rc = pcu_rx_data_req(bts, msg_type, &pcu_prim->u.data_req); break; default: @@ -574,7 +584,14 @@ goto close; } - rc = pcu_rx(state->net, pcu_prim->msg_type, pcu_prim); + if (rc < PCUIF_HDR_SIZE) { + LOGP(DPCU, LOGL_ERROR, "Received %d bytes on PCU Socket, but primitive hdr size " + "is %zu, discarding\n", rc, PCUIF_HDR_SIZE); + msgb_free(msg); + return 0; + } + + rc = pcu_rx(state->net, pcu_prim->msg_type, pcu_prim, rc); /* as we always synchronously process the message in pcu_rx() and * its callbacks, we can free the message here. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I247c6f4b5a7a22d17a060a558c4ceb9221ca7351 Gerrit-Change-Number: 29361 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: osmo-hnbgw-master: build with --enable-pfcp
by neels 15 Sep '22

15 Sep '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29355 ) Change subject: osmo-hnbgw-master: build with --enable-pfcp ...................................................................... osmo-hnbgw-master: build with --enable-pfcp Change-Id: If84261cba2bf3b75c454fd5d16fd19a88a468eb7 --- M osmo-hnbgw-master/Dockerfile 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 4f7fbb5..d842fb3 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -14,7 +14,9 @@ libosmo-ranap-dev \ libosmo-rua-dev \ libosmo-hnbap-dev \ - libasn1c-dev && \ + libasn1c-dev \ + libosmo-pfcp-dev \ + && \ apt-get clean WORKDIR /tmp @@ -29,7 +31,7 @@ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_HNBGW_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure && \ + ./configure --enable-pfcp && \ make "-j$(nproc)" install && \ ldconfig -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If84261cba2bf3b75c454fd5d16fd19a88a468eb7 Gerrit-Change-Number: 29355 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in docker-playground[master]: osmo-hnbgw-master: build with --enable-pfcp
by neels 15 Sep '22

15 Sep '22

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29355 ) Change subject: osmo-hnbgw-master: build with --enable-pfcp ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I would really enable pfcp by default at some point near in time. it was discussed before with a different conclusion -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If84261cba2bf3b75c454fd5d16fd19a88a468eb7 Gerrit-Change-Number: 29355 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 12:53:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: add ttcn3-hnbgw-test variant with-pfcp
by neels 15 Sep '22

15 Sep '22

Attention is currently required from: osmith, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29339 ) Change subject: add ttcn3-hnbgw-test variant with-pfcp ...................................................................... Patch Set 4: (1 comment) File ttcn3-hnbgw-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/29339/comment/030b802e_0ea… PS3, Line 82: echo Starting container with STP > running with gdb in the jenkins.sh? […] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I02b60941343000a4618e95f56326bec170c32bfe Gerrit-Change-Number: 29339 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 12:50:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: add ttcn3-hnbgw-test variant with-pfcp
by neels 15 Sep '22

15 Sep '22

Attention is currently required from: osmith, pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/29339 to look at the new patch set (#4). Change subject: add ttcn3-hnbgw-test variant with-pfcp ...................................................................... add ttcn3-hnbgw-test variant with-pfcp Run HNBGW tests a second time with PFCP enabled. Just run all the same tests again, no matter if they are related to PS RAB Assignment or not, to also ensure no ill side effects from PFCP configuration. Related: SYS#5895 Depends: I511e758807e0512c18f3f9e0a8c4699b9a3f5992 (osmo-ttcn3-hacks) Change-Id: I02b60941343000a4618e95f56326bec170c32bfe --- M ttcn3-hnbgw-test/jenkins.sh A ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg A ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg 3 files changed, 164 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/39/29339/4 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I02b60941343000a4618e95f56326bec170c32bfe Gerrit-Change-Number: 29339 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libosmocore[master]: vty: Allow using hex representations in cmd numeric ranges
by fixeria 15 Sep '22

15 Sep '22

Attention is currently required from: neels, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex representations in cmd numeric ranges ...................................................................... Patch Set 6: (3 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19422/comment/de6283d2_15fb856b PS6, Line 9: in hexadecimal range I would say: "... using hexadecimal notation". Not critical. File src/vty/command.c: https://gerrit.osmocom.org/c/libosmocore/+/19422/comment/843f0d85_ed249169 PS6, Line 1487: error s/error/a negative value/ https://gerrit.osmocom.org/c/libosmocore/+/19422/comment/098c9a5c_dec050c3 PS6, Line 1505: if (isdigit(*ptr) || > just use isxdigit()? Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 12:29:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: add ttcn3-hnbgw-test variant with-pfcp
by neels 15 Sep '22

15 Sep '22

Attention is currently required from: osmith, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29339 ) Change subject: add ttcn3-hnbgw-test variant with-pfcp ...................................................................... Patch Set 3: (1 comment) File ttcn3-hnbgw-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/29339/comment/f5d5a5cb_f63… PS3, Line 82: echo Starting container with STP > If you want to understand what's run here, and how run a subset of the things here: yes it helps a l […] running with gdb in the jenkins.sh? i still disagree that it helps at all nor that it's worth the effort but if it makes your day and if we can stop ping ponging on bikesheds in a jenkins ci shell script that could hardly be more obscure in the first place even without indirection of calling functions with parameters... hrm. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I02b60941343000a4618e95f56326bec170c32bfe Gerrit-Change-Number: 29339 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 12:25:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: vty: Allow using hex representations in cmd numeric ranges
by neels 15 Sep '22

15 Sep '22

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex representations in cmd numeric ranges ...................................................................... Patch Set 6: Code-Review+1 (1 comment) File src/vty/command.c: https://gerrit.osmocom.org/c/libosmocore/+/19422/comment/1f5b7854_6026b341 PS6, Line 1505: if (isdigit(*ptr) || just use isxdigit()? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 12:15:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: osmo-hnbgw-master: build with --enable-pfcp
by fixeria 15 Sep '22

15 Sep '22

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29355 ) Change subject: osmo-hnbgw-master: build with --enable-pfcp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If84261cba2bf3b75c454fd5d16fd19a88a468eb7 Gerrit-Change-Number: 29355 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 12:13:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log