fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40043?usp=email )
Change subject: fixup: ttcn3-bts-test: use an older version of fake_trx.py
......................................................................
fixup: ttcn3-bts-test: use an older version of fake_trx.py
Setting OSMO_BB_BRANCH=ttcn3-bts-test did not achieve the goal, because
it was not consumed by the osmocom-bb-host-master's Makefile. Setting
it in jenkins.sh does the trick.
Change-Id: Ib6857fafd4085aae91eec9c67f08766bdabeb2b7
Fixes: 8540ae7 ("ttcn3-bts-test: use an older version of fake_trx.py")
---
M ttcn3-bts-test/Makefile
M ttcn3-bts-test/jenkins.sh
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile
index 2af27a9..26ac873 100644
--- a/ttcn3-bts-test/Makefile
+++ b/ttcn3-bts-test/Makefile
@@ -1,7 +1,3 @@
-# XXX: use an older version of fake_trx.py, that predates
-# commit 0f4714776a9c9b64c4a7268eb8a346f304835565 (OS#6672).
-OSMO_BB_BRANCH=ttcn3-bts-test
-
include ../make/Makefile
CFG_SRC_FILES = \
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 1bb92d8..edb7030 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -2,6 +2,10 @@
TEST_CONFIGS_ALL="generic virtphy oml hopping"
TEST_CONFIGS="${TEST_CONFIGS:-"generic oml hopping"}"
+# XXX: use an older version of fake_trx.py, that predates
+# commit 0f4714776a9c9b64c4a7268eb8a346f304835565 (OS#6672).
+export OSMO_BB_BRANCH=ttcn3-bts-test
+
. ../jenkins-common.sh
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
# NOTE: there is no osmocom-bb-host-latest, hence always use master!
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40043?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ib6857fafd4085aae91eec9c67f08766bdabeb2b7
Gerrit-Change-Number: 40043
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Attention is currently required from: fixeria.
osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/docker-playground/+/40043?usp=email )
Change subject: fixup: ttcn3-bts-test: use an older version of fake_trx.py
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40043?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ib6857fafd4085aae91eec9c67f08766bdabeb2b7
Gerrit-Change-Number: 40043
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Apr 2025 09:17:12 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40043?usp=email )
Change subject: fixup: ttcn3-bts-test: use an older version of fake_trx.py
......................................................................
fixup: ttcn3-bts-test: use an older version of fake_trx.py
Setting OSMO_BB_BRANCH=ttcn3-bts-test did not achieve the goal, because
it was not consumed by the osmocom-bb-host-master's Makefile. Setting
it in jenkins.sh does the trick.
Change-Id: Ib6857fafd4085aae91eec9c67f08766bdabeb2b7
Fixes: 8540ae7 ("ttcn3-bts-test: use an older version of fake_trx.py")
---
M ttcn3-bts-test/Makefile
M ttcn3-bts-test/jenkins.sh
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/43/40043/1
diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile
index 2af27a9..26ac873 100644
--- a/ttcn3-bts-test/Makefile
+++ b/ttcn3-bts-test/Makefile
@@ -1,7 +1,3 @@
-# XXX: use an older version of fake_trx.py, that predates
-# commit 0f4714776a9c9b64c4a7268eb8a346f304835565 (OS#6672).
-OSMO_BB_BRANCH=ttcn3-bts-test
-
include ../make/Makefile
CFG_SRC_FILES = \
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 1bb92d8..edb7030 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -2,6 +2,10 @@
TEST_CONFIGS_ALL="generic virtphy oml hopping"
TEST_CONFIGS="${TEST_CONFIGS:-"generic oml hopping"}"
+# XXX: use an older version of fake_trx.py, that predates
+# commit 0f4714776a9c9b64c4a7268eb8a346f304835565 (OS#6672).
+export OSMO_BB_BRANCH=ttcn3-bts-test
+
. ../jenkins-common.sh
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
# NOTE: there is no osmocom-bb-host-latest, hence always use master!
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40043?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ib6857fafd4085aae91eec9c67f08766bdabeb2b7
Gerrit-Change-Number: 40043
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39666?usp=email
to look at the new patch set (#5).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: s1gw_metrics: add histograms for gen_sctp:send/3 delay
......................................................................
s1gw_metrics: add histograms for gen_sctp:send/3 delay
https://www.erlang.org/doc/apps/kernel/gen_sctp.html#send/3 clearly
states that gen_sctp:send/3 is blocking, unless non_block_send is set.
With the current architecture of the S1GW, gen_sctp:send/3 may block
the S1GW-MME link (sctp_client) or the eNB-S1GW link (sctp_server)
completely, preventing sending and receiving of other S1AP PDUs.
Ideally, we should rework the S1GW to spawn a separate process for
each received S1AP PDU, so that blocking gen_sctp:send/3 would at
least not block receiving and processing of incoming PDUs.
But this would require quite some effort.
For now, let's add a histogram reflecting min/max/avg/mean/median
delay caused by gen_sctp:send/3, so that we can detect this when
the problem starts biting us.
Change-Id: I7633a6e6182bda3fca4e7562e2b780b2b9f9708f
Related: SYS#7288
---
M config/sys.config
M include/s1gw_metrics.hrl
M src/s1gw_metrics.erl
M src/sctp_common.erl
M src/sctp_proxy.erl
M src/sctp_server.erl
6 files changed, 54 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/66/39666/5
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39666?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I7633a6e6182bda3fca4e7562e2b780b2b9f9708f
Gerrit-Change-Number: 39666
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39975?usp=email )
Change subject: msc: add TC_mo_ussd_evil_ms for OS#6756
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39975?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If1d85a1b4b63b01b4565e53677acfd21e664e799
Gerrit-Change-Number: 39975
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Thu, 17 Apr 2025 06:20:25 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/39976?usp=email )
Change subject: gsm0911_rcv_nc_ss(): avoid assertion failure in msc_a_put()
......................................................................
gsm0911_rcv_nc_ss(): avoid assertion failure in msc_a_put()
It was reported by a user that osmo-msc hits an assertion failure:
Assert failed osmo_use_count_get_put(&msc_a->use_count, "cm_service_ss", -1) == 0 gsm_09_11.c:147
It's yet unclear how can this happen, because the MS/UE shall not be
sending SS/USSD messages without a prior CM Service Request. However,
I was able to write an "evil MS" testcase that reproduces the problem
(see the related patch). This is pretty much a DoS vector, so let's
add safety checks preventing this to gsm0911_rcv_nc_ss().
Change-Id: I724f0f0c9ef8611d3c3653e9370361b252127f72
Related: osmo-ttcn3-hacks.git If1d85a1b4b63b01b4565e53677acfd21e664e799
Related: 5fb4a9efcf ("Release BSS connection when SS message is rejected")
Related: OS#6756
---
M src/libmsc/gsm_09_11.c
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c
index 442995e..f0d31bb 100644
--- a/src/libmsc/gsm_09_11.c
+++ b/src/libmsc/gsm_09_11.c
@@ -143,8 +143,10 @@
GSM48_PDISC_NC_SS | (tid << 4),
GSM0480_MTYPE_RELEASE_COMPLETE);
/* Decrement use counter that has been incremented by CM Service Request (SS).
- * If there is no other service request, the BSS connection will be released. */
- msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SS);
+ * If there is no other service request, the BSS connection will be released.
+ * Guard against an "evil" MS/UE not sending CM Service Request (see OS#6756). */
+ if (osmo_use_count_by(&msc_a->use_count, MSC_A_USE_CM_SERVICE_SS))
+ msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SS);
return -EINVAL;
}
@@ -155,8 +157,10 @@
GSM48_PDISC_NC_SS | (tid << 4),
GSM0480_MTYPE_RELEASE_COMPLETE);
/* Decrement use counter that has been incremented by CM Service Request (SS).
- * If there is no other service request, the BSS connection will be released. */
- msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SS);
+ * If there is no other service request, the BSS connection will be released.
+ * Guard against an "evil" MS/UE not sending CM Service Request (see OS#6756). */
+ if (osmo_use_count_by(&msc_a->use_count, MSC_A_USE_CM_SERVICE_SS))
+ msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SS);
return -ENOMEM;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39976?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I724f0f0c9ef8611d3c3653e9370361b252127f72
Gerrit-Change-Number: 39976
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>