fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/43736?usp=email )
Change subject: proxy: clck_gen_timer_cb(): sanitize expire_count
......................................................................
proxy: clck_gen_timer_cb(): sanitize expire_count
The number of timer expirations read from the timerfd is used as the
loop boundary. It is already bounded indirectly by the PC clock skew
check, but let's also check it explicitly against the
same CLCK_GEN_MAX_FN_SKEW limit.
Change-Id: I55f736c9bff58034c197f876206efc817da30204
Fixes: CID#564331
---
M proxy/src/clck_gen.c
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/proxy/src/clck_gen.c b/proxy/src/clck_gen.c
index 39abc6c..2798b88 100644
--- a/proxy/src/clck_gen.c
+++ b/proxy/src/clck_gen.c
@@ -99,6 +99,16 @@
return 0;
}
+ /* the number of expirations is also bounded by the skew limit */
+ if (expire_count > CLCK_GEN_MAX_FN_SKEW) {
+ LOGP(DTRXC, LOGL_FATAL,
+ "Too many timer expirations (%" PRIu64 "): "
+ "stopping the TDMA clock generator\n",
+ expire_count);
+ clck_gen_stop(gen);
+ return 0;
+ }
+
while (expire_count-- > 0) {
const struct proxy_trx *trx;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43736?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I55f736c9bff58034c197f876206efc817da30204
Gerrit-Change-Number: 43736
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-trx/+/43737?usp=email )
Change subject: proxy: properly set .trx_num in {NOPE,BURST}.ind
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43737?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ib748ed7b681b582fdfad829a1940d71148e63334
Gerrit-Change-Number: 43737
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 01 Oct 2026 16:10:07 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: jolly, pespin.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email
to look at the new patch set (#9).
The following approvals got outdated and were removed:
Code-Review+1 by pespin, Verified+1 by Jenkins Builder
Change subject: Add Cisco like DSCP configuration support
......................................................................
Add Cisco like DSCP configuration support
Add Cisco like VTY configuration support for DSCP. QoS classes can be
defined and configured per SS7 instance and the classes can be assigned
to listener and connections like this:
cs7 instance 0
qos class 3
qos-ip-dscp 36
...
asp myasp 2905 2905 m3ua
qos-class 3
...
asp asp-srv-m3ua 2906 2905 m3ua
qos-class 3
...
asp asp-clnt-m3ua 2905 2906 m3ua
qos-class 3
...
Ensure that the ongoing listener or connection socket is updated
whenever the QoS class is changed or deleted or its DSCP value is
changed.
Deprecated "ip-dscp" and "init-ip-dscp" configuration is still
supported. When QoS class is assigned, the deprecated configuration is
removed and vice versa.
Update vty tests to the new VTY command layout and test the new VTY
commands.
Related: OS#6753
Depends-on: I06927855a173c5b6dbf5c93aa08ea75e1d9d5f37 (libosmocore)
Change-Id: Ic346698fc63771d95e474aec53ffb6c776636b3b
---
M TODO-RELEASE
M src/Makefile.am
M src/ss7_asp.c
M src/ss7_asp.h
M src/ss7_asp_vty.c
M src/ss7_instance.c
M src/ss7_instance.h
A src/ss7_qos_class.c
A src/ss7_qos_class.h
A src/ss7_qos_class_vty.c
M src/ss7_vty.c
M src/ss7_vty.h
M src/ss7_xua_srv.c
M src/ss7_xua_srv.h
M src/ss7_xua_srv_vty.c
M tests/vty/osmo_stp_test.vty
M tests/vty/ss7_asp_test.vty
M tests/vty/vty_test_runner.py
18 files changed, 469 insertions(+), 52 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/67/43667/9
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ic346698fc63771d95e474aec53ffb6c776636b3b
Gerrit-Change-Number: 43667
Gerrit-PatchSet: 9
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>