November 2022 - gerrit-log - lists.osmocom.org

Change in osmo-pcu[master]: Refactor tbf_is_tfi_assigned() to avoid accessing tbf->state_fsm

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30219 ) Change subject: Refactor tbf_is_tfi_assigned() to avoid accessing tbf->state_fsm ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I360485c73be8636565f89ba29796d84ac94fd94e Gerrit-Change-Number: 30219 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Nov 2022 15:13:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Check received osmuxh->amr_ft is correct before using it

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30224 ) Change subject: osmux: Check received osmuxh->amr_ft is correct before using it ...................................................................... osmux: Check received osmuxh->amr_ft is correct before using it Fixes: Coverity CID#283432 Change-Id: Iab525c5b7eb1e455a8229fb39e96897aac53298c --- M src/osmux_output.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/24/30224/1 diff --git a/src/osmux_output.c b/src/osmux_output.c index a6e6513..6b9f451 100644 --- a/src/osmux_output.c +++ b/src/osmux_output.c @@ -68,6 +68,11 @@ case OSMUX_FT_VOICE_AMR: break; case OSMUX_FT_DUMMY: + if (!osmo_amr_ft_valid(osmuxh->amr_ft)) { + LOGP(DLMUX, LOGL_ERROR, "Discarding bad Dummy FT: amr_ft=%u\n", + osmuxh->amr_ft); + return NULL; + } len = osmux_ft_dummy_size(osmuxh->amr_ft, osmuxh->ctr + 1); if (msgb_length(msg) < len) { LOGP(DLMUX, LOGL_ERROR, "Discarding bad Dummy FT: %s\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iab525c5b7eb1e455a8229fb39e96897aac53298c Gerrit-Change-Number: 30224 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Refactor osmux_xfrm_output_pull() to simplify code flow

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30225 ) Change subject: osmux: Refactor osmux_xfrm_output_pull() to simplify code flow ...................................................................... osmux: Refactor osmux_xfrm_output_pull() to simplify code flow Change-Id: I0da1d7875bd32f6c1022676b64f9f0d14bad3144 --- M src/osmux_output.c 1 file changed, 34 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/25/30225/1 diff --git a/src/osmux_output.c b/src/osmux_output.c index 6b9f451..33d977b 100644 --- a/src/osmux_output.c +++ b/src/osmux_output.c @@ -57,58 +57,53 @@ struct osmux_hdr *osmux_xfrm_output_pull(struct msgb *msg) { struct osmux_hdr *osmuxh; + size_t len; + next: - osmuxh = NULL; - if (msg->len > sizeof(struct osmux_hdr)) { - size_t len; + if (msgb_length(msg) == 0) + return NULL; /* base case, we drained the msg successfully, tell user it is done. */ - osmuxh = (struct osmux_hdr *)msg->data; + if (msgb_length(msg) < sizeof(struct osmux_hdr)) { + LOGP(DLMUX, LOGL_ERROR, "remaining %d bytes, broken osmuxhdr?\n", msgb_length(msg)); + return NULL; + } - switch (osmuxh->ft) { - case OSMUX_FT_VOICE_AMR: - break; - case OSMUX_FT_DUMMY: - if (!osmo_amr_ft_valid(osmuxh->amr_ft)) { - LOGP(DLMUX, LOGL_ERROR, "Discarding bad Dummy FT: amr_ft=%u\n", - osmuxh->amr_ft); - return NULL; - } - len = osmux_ft_dummy_size(osmuxh->amr_ft, osmuxh->ctr + 1); - if (msgb_length(msg) < len) { - LOGP(DLMUX, LOGL_ERROR, "Discarding bad Dummy FT: %s\n", - osmo_hexdump(msg->data, msgb_length(msg))); - return NULL; - } - msgb_pull(msg, len); - goto next; - default: - LOGP(DLMUX, LOGL_ERROR, "Discarding unsupported Osmux FT %d\n", - osmuxh->ft); - return NULL; - } + osmuxh = (struct osmux_hdr *)msgb_data(msg); + switch (osmuxh->ft) { + case OSMUX_FT_VOICE_AMR: if (!osmo_amr_ft_valid(osmuxh->amr_ft)) { - LOGP(DLMUX, LOGL_ERROR, "Discarding bad AMR FT %d\n", - osmuxh->amr_ft); + LOGP(DLMUX, LOGL_ERROR, "Discarding bad AMR FT %d\n", osmuxh->amr_ft); return NULL; } - - len = osmo_amr_bytes(osmuxh->amr_ft) * (osmuxh->ctr+1) + - sizeof(struct osmux_hdr); - + len = osmo_amr_bytes(osmuxh->amr_ft) * (osmuxh->ctr + 1) + sizeof(struct osmux_hdr); if (msgb_length(msg) < len) { LOGP(DLMUX, LOGL_ERROR, "Discarding malformed OSMUX message: %s\n", - osmo_hexdump(msg->data, msgb_length(msg))); + osmo_hexdump(msgb_data(msg), msgb_length(msg))); return NULL; } - msgb_pull(msg, len); - } else if (msg->len > 0) { - LOGP(DLMUX, LOGL_ERROR, - "remaining %d bytes, broken osmuxhdr?\n", msg->len); - } + return osmuxh; - return osmuxh; + case OSMUX_FT_DUMMY: + if (!osmo_amr_ft_valid(osmuxh->amr_ft)) { + LOGP(DLMUX, LOGL_ERROR, "Discarding bad Dummy FT: amr_ft=%u\n", osmuxh->amr_ft); + return NULL; + } + len = osmux_ft_dummy_size(osmuxh->amr_ft, osmuxh->ctr + 1); + if (msgb_length(msg) < len) { + LOGP(DLMUX, LOGL_ERROR, "Discarding bad Dummy FT: %s\n", + osmo_hexdump(msgb_data(msg), msgb_length(msg))); + return NULL; + } + msgb_pull(msg, len); + goto next; + + default: + LOGP(DLMUX, LOGL_ERROR, "Discarding unsupported Osmux FT %d\n", + osmuxh->ft); + return NULL; + } } static struct msgb * -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I0da1d7875bd32f6c1022676b64f9f0d14bad3144 Gerrit-Change-Number: 30225 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in libosmo-netif[master]: amr: Guard against incorrect AMR FT passed to osmo_amr_{bits,bytes}()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30223 ) Change subject: amr: Guard against incorrect AMR FT passed to osmo_amr_{bits,bytes}() ...................................................................... amr: Guard against incorrect AMR FT passed to osmo_amr_{bits,bytes}() Fixes: Coverity CID#283433 Change-Id: Ib11d4b64c6df19a85c4374fde89e1b56f410e438 --- M src/amr.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/23/30223/1 diff --git a/src/amr.c b/src/amr.c index 6ed5b6c..1b750eb 100644 --- a/src/amr.c +++ b/src/amr.c @@ -14,6 +14,8 @@ #include <unistd.h> #include <string.h> #include <stdbool.h> + +#include <osmocom/core/utils.h> #include <osmocom/netif/amr.h> /* According to TS 26.101: @@ -56,11 +58,13 @@ size_t osmo_amr_bits(uint8_t amr_ft) { + OSMO_ASSERT(amr_ft < AMR_FT_MAX); return amr_ft_to_bits[amr_ft]; } size_t osmo_amr_bytes(uint8_t amr_ft) { + OSMO_ASSERT(amr_ft < AMR_FT_MAX); return amr_ft_to_bytes[amr_ft]; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib11d4b64c6df19a85c4374fde89e1b56f410e438 Gerrit-Change-Number: 30223 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: tbf_fsm: Move osmo_fsm_inst fi out of struct tbf_fsm_ctx

by msuraev

Attention is currently required from: pespin, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30216 ) Change subject: tbf_fsm: Move osmo_fsm_inst fi out of struct tbf_fsm_ctx ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I03e691ccf6a94431caa55653349158f5b85db017 Gerrit-Change-Number: 30216 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Nov 2022 15:08:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: cosmetic: tbf_fsm.h: Fix whitespace

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30214 ) Change subject: cosmetic: tbf_fsm.h: Fix whitespace ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ica93494c386a006587deff08e9add6174cc42f70 Gerrit-Change-Number: 30214 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: reorganize the core logic into libtrxcon.la

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30101 ) Change subject: trxcon: reorganize the core logic into libtrxcon.la ...................................................................... Patch Set 2: (1 comment) File src/host/trxcon/src/trxcon_inst.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30101/comment/8f12e666_a4c8e053 PS2, Line 51: schc = logc[i]; > Both schc and schd are passed to l1sched_logging_init(), in case you meant that. Ah they are passed below, nevermind. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idf207947f620a7394e0a0e5bf2c37bcd8df64bbe Gerrit-Change-Number: 30101 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Nov 2022 14:47:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: cosmetic: tbf_fsm.h: Fix whitespace

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30214 ) Change subject: cosmetic: tbf_fsm.h: Fix whitespace ...................................................................... Patch Set 1: (1 comment) File src/tbf_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/30214/comment/136014c5_c99f0988 PS1, Line 44: TBF_ST_NEW = 0, /* new created TBF */ > It's a bug in my editor apparently, sorry for that. […] hexdump confirms that it's a tab (0x09). -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ica93494c386a006587deff08e9add6174cc42f70 Gerrit-Change-Number: 30214 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Nov 2022 13:39:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: reorganize the core logic into libtrxcon.la

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30101 ) Change subject: trxcon: reorganize the core logic into libtrxcon.la ...................................................................... Patch Set 2: (1 comment) File src/host/trxcon/src/trxcon_inst.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30101/comment/0d0f6b30_5d3ca057 PS2, Line 51: schc = logc[i]; > This two? Unused? I don't understand the question, sorry. Both schc and schd are passed to l1sched_logging_init(), in case you meant that. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idf207947f620a7394e0a0e5bf2c37bcd8df64bbe Gerrit-Change-Number: 30101 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Nov 2022 13:34:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: reorganize the core logic into libtrxcon.la

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30101 ) Change subject: trxcon: reorganize the core logic into libtrxcon.la ...................................................................... Patch Set 2: (2 comments) File src/host/trxcon/src/trxcon_inst.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30101/comment/ae5caeff_abbadc0d PS2, Line 31: extern int g_logc_l1c; > you could even just store an array here and use it internally: […] Either way is ok with me. What you suggest, IMO, is a bit more cumbersome though. https://gerrit.osmocom.org/c/osmocom-bb/+/30101/comment/ec4a1507_3ef0dcab PS2, Line 51: schc = logc[i]; > so this two aren't used? This two? Unused? I don't understand the question, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idf207947f620a7394e0a0e5bf2c37bcd8df64bbe Gerrit-Change-Number: 30101 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Nov 2022 13:31:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022