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

[S] Change in osmo-msc[master]: smpp_msc: submit_to_sms: check ud_len > sms_msg_len
by osmith 22 Jun '23

22 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33397 ) Change subject: smpp_msc: submit_to_sms: check ud_len > sms_msg_len ...................................................................... smpp_msc: submit_to_sms: check ud_len > sms_msg_len Fixes: CID#240727 Change-Id: Ie01ac84816f6ac3ba5631a643d486fb0dfb05eb2 --- M src/libsmpputil/smpp_msc.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/97/33397/1 diff --git a/src/libsmpputil/smpp_msc.c b/src/libsmpputil/smpp_msc.c index 87cab00..fed5858 100644 --- a/src/libsmpputil/smpp_msc.c +++ b/src/libsmpputil/smpp_msc.c @@ -245,6 +245,12 @@ sms->data_coding_scheme = GSM338_DCS_1111_7BIT; if (sms->ud_hdr_ind) { ud_len = *sms_msg + 1; + if (ud_len > sms_msg_len) { + sms_free(sms); + LOGP(DLSMS, LOGL_ERROR, "invalid ud_len=%u > sms_msg_len=%u\n", ud_len, + sms_msg_len); + return ESME_RINVPARLEN; + } printf("copying %u bytes user data...\n", ud_len); memcpy(sms->user_data, sms_msg, OSMO_MIN(ud_len, sizeof(sms->user_data))); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie01ac84816f6ac3ba5631a643d486fb0dfb05eb2 Gerrit-Change-Number: 33397 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: sdp_msg_test: fix dereference after null check
by osmith 22 Jun '23

22 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33396 ) Change subject: sdp_msg_test: fix dereference after null check ...................................................................... sdp_msg_test: fix dereference after null check Fixes: CID#274690 Change-Id: Ic59252e4f1d4daf5f86c6b73ec951e02109df9bc --- M tests/sdp_msg/sdp_msg_test.c 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/33396/1 diff --git a/tests/sdp_msg/sdp_msg_test.c b/tests/sdp_msg/sdp_msg_test.c index ebe8328..4798ae0 100644 --- a/tests/sdp_msg/sdp_msg_test.c +++ b/tests/sdp_msg/sdp_msg_test.c @@ -526,6 +526,8 @@ struct sdp_msg sdp = {}; struct sdp_audio_codec *codec; char buf[1024]; + const char *expect_sdp; + printf("\n[%d]\n", i); rc = sdp_msg_from_sdp_str(&sdp, t->sdp); if (rc) { @@ -542,14 +544,15 @@ printf("SDP: %s\n", sdp_audio_codecs_to_str(&sdp.audio_codecs)); sdp_msg_to_sdp_str_buf(buf, sizeof(buf), &sdp); - if (strcmp(buf, t->expect_sdp ? : t->sdp)) { + expect_sdp = t->expect_sdp ? : t->sdp; + if (strcmp(buf, expect_sdp)) { int j; ok = false; printf("ERROR:\n"); dump_sdp(buf, "selection result: "); - dump_sdp(t->expect_sdp, "expect result: "); - for (j = 0; t->expect_sdp[j]; j++) { - if (t->expect_sdp[j] != buf[j]) { + dump_sdp(expect_sdp, "expect result: "); + for (j = 0; expect_sdp[j]; j++) { + if (expect_sdp[j] != buf[j]) { printf("ERROR at position %d, at:\n", j); dump_sdp(buf + j, " mismatch: "); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic59252e4f1d4daf5f86c6b73ec951e02109df9bc Gerrit-Change-Number: 33396 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: smpp_handle_bind_tx: initialize tlv
by osmith 22 Jun '23

22 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33395 ) Change subject: smpp_handle_bind_tx: initialize tlv ...................................................................... smpp_handle_bind_tx: initialize tlv Fixes: CID#272977 Change-Id: I22da1aa95bf19a9bb1d8e0875f3b68356d801c70 --- M src/libsmpputil/smpp_smsc.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/95/33395/1 diff --git a/src/libsmpputil/smpp_smsc.c b/src/libsmpputil/smpp_smsc.c index d54b3c1..314dc60 100644 --- a/src/libsmpputil/smpp_smsc.c +++ b/src/libsmpputil/smpp_smsc.c @@ -467,7 +467,7 @@ { struct bind_transmitter_t bind; struct bind_transmitter_resp_t bind_r; - struct tlv_t tlv; + struct tlv_t tlv = {}; int rc; SMPP34_UNPACK(rc, BIND_TRANSMITTER, &bind, msgb_data(msg), -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I22da1aa95bf19a9bb1d8e0875f3b68356d801c70 Gerrit-Change-Number: 33395 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: msc_ho_send_handover_request: fix check_after_deref
by osmith 22 Jun '23

22 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33398 ) Change subject: msc_ho_send_handover_request: fix check_after_deref ...................................................................... msc_ho_send_handover_request: fix check_after_deref Fixes: CID#211073 Change-Id: I9389cc9c4af987c11652c6fe9a0ff4289a7781c9 --- M src/libmsc/msc_ho.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/33398/1 diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index 2a5891a..cbdf00e 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -401,8 +401,8 @@ /* Don't send AoIP Transport Layer Address for inter-MSC Handover */ .rtp_ran_local = (msc_a->ho.new_cell.type == MSC_NEIGHBOR_TYPE_LOCAL_RAN_PEER) ? call_leg_local_ip(msc_a->cc.call_leg, RTP_TO_RAN) : NULL, - .call_id_present = true, - .call_id = cc_trans->callref, + .call_id_present = cc_trans ? true : false, + .call_id = cc_trans ? cc_trans->callref : 0, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9389cc9c4af987c11652c6fe9a0ff4289a7781c9 Gerrit-Change-Number: 33398 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: gsm48_cc_tx_alerting: check rc of sdp_msg_from_sdp_str
by osmith 22 Jun '23

22 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33394 ) Change subject: gsm48_cc_tx_alerting: check rc of sdp_msg_from_sdp_str ...................................................................... gsm48_cc_tx_alerting: check rc of sdp_msg_from_sdp_str Fixes: CID#321280 Change-Id: Id372d2d844446d6667a00dae22bdf8ed36c599ba --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/94/33394/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 1d99421..5664f4c 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1110,6 +1110,7 @@ struct gsm_mncc *alerting = arg; struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC ALERT"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + int rc; gh->msg_type = GSM48_MT_CC_ALERTING; @@ -1128,7 +1129,11 @@ if (alerting->sdp[0]) { struct call_leg *cl = trans->msc_a->cc.call_leg; struct rtp_stream *rtp_cn = cl ? cl->rtp[RTP_TO_CN] : NULL; - sdp_msg_from_sdp_str(&trans->cc.remote, alerting->sdp); + + rc = sdp_msg_from_sdp_str(&trans->cc.remote, alerting->sdp); + if (rc < 0) + return rc; + trans_cc_filter_run(trans); LOG_TRANS(trans, LOGL_DEBUG, "msg_type=%s\n", get_mncc_name(alerting->msg_type)); if (rtp_cn) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id372d2d844446d6667a00dae22bdf8ed36c599ba Gerrit-Change-Number: 33394 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: csd_bs_list_to_gsm0808_channel_type: fix rc check
by osmith 22 Jun '23

22 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33393 ) Change subject: csd_bs_list_to_gsm0808_channel_type: fix rc check ...................................................................... csd_bs_list_to_gsm0808_channel_type: fix rc check Check the return code before writing it to unsigned ct->data_rate, as "ct->data_rate < 0" is never true. Fixes: CID#321277 Fixes: 106321 ("Add initial CSD support with external MNCC") Change-Id: I5d77da71b60748818ba631229126c1bf061a9c7d --- M src/libmsc/csd_bs.c 1 file changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/33393/1 diff --git a/src/libmsc/csd_bs.c b/src/libmsc/csd_bs.c index adb9293..2322f20 100644 --- a/src/libmsc/csd_bs.c +++ b/src/libmsc/csd_bs.c @@ -375,14 +375,16 @@ if (csd_bs_is_transp(list->bs[0])) { ct->data_transparent = true; - ct->data_rate = csd_bs_to_gsm0808_data_rate_transp(list->bs[0]); + rc = csd_bs_to_gsm0808_data_rate_transp(list->bs[0]); } else { - ct->data_rate = csd_bs_to_gsm0808_data_rate_non_transp(list->bs[0]); + rc = csd_bs_to_gsm0808_data_rate_non_transp(list->bs[0]); } - if (ct->data_rate < 0) + if (rc < 0) return -EINVAL; + ct->data_rate = rc; + /* Other possible data rates allowed (3GPP TS 48.008 § 3.2.2.11, 5a) */ if (!ct->data_transparent && list->count > 1) { for (i = 1; i < list->count; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5d77da71b60748818ba631229126c1bf061a9c7d Gerrit-Change-Number: 33393 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: BSC_ConnectionHandler: fix cpars.csd
by osmith 22 Jun '23

22 Jun '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 ) Change subject: msc: BSC_ConnectionHandler: fix cpars.csd ...................................................................... msc: BSC_ConnectionHandler: fix cpars.csd Fix for: BSC_ConnectionHandler.ttcn:1546 Dynamic test case error: Using the value of an unbound boolean variable. Fixes: 92b280c8 ("msc: new test: TC_lu_and_mo_csd") Change-Id: I733db4dbc3ba3dd52ba501901b8b0ed36ff13344 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 15 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/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 039a97d..8c9f63f 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -992,6 +992,7 @@ mo_call := false, bearer_cap := valueof(ts_Bcap_voice), emergency := false, + csd := false, mncc_callref := omit, mncc_bearer_cap := valueof(ts_MNCC_bcap_voice), mncc_rtp_ip := "42.23.11.5", @@ -1031,6 +1032,7 @@ mo_call := ?, bearer_cap := ?, emergency := ?, + csd := ?, mncc_callref := *, mncc_bearer_cap := ?, mncc_rtp_ip := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I733db4dbc3ba3dd52ba501901b8b0ed36ff13344 Gerrit-Change-Number: 33392 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: BSC_ConnectionHandler: fix cpars.csd
by fixeria 21 Jun '23

21 Jun '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 ) Change subject: msc: BSC_ConnectionHandler: fix cpars.csd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I733db4dbc3ba3dd52ba501901b8b0ed36ff13344 Gerrit-Change-Number: 33392 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Jun 2023 16:58:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: BSC_ConnectionHandler: fix cpars.csd
by pespin 21 Jun '23

21 Jun '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 ) Change subject: msc: BSC_ConnectionHandler: fix cpars.csd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I733db4dbc3ba3dd52ba501901b8b0ed36ff13344 Gerrit-Change-Number: 33392 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Jun 2023 16:29:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: BSC_ConnectionHandler: fix cpars.csd
by osmith 21 Jun '23

21 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 ) Change subject: msc: BSC_ConnectionHandler: fix cpars.csd ...................................................................... msc: BSC_ConnectionHandler: fix cpars.csd Fix for: BSC_ConnectionHandler.ttcn:1546 Dynamic test case error: Using the value of an unbound boolean variable. Fixes: 92b280c8 ("msc: new test: TC_lu_and_mo_csd") Change-Id: I733db4dbc3ba3dd52ba501901b8b0ed36ff13344 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/33392/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 039a97d..8c9f63f 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -992,6 +992,7 @@ mo_call := false, bearer_cap := valueof(ts_Bcap_voice), emergency := false, + csd := false, mncc_callref := omit, mncc_bearer_cap := valueof(ts_MNCC_bcap_voice), mncc_rtp_ip := "42.23.11.5", @@ -1031,6 +1032,7 @@ mo_call := ?, bearer_cap := ?, emergency := ?, + csd := ?, mncc_callref := *, mncc_bearer_cap := ?, mncc_rtp_ip := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I733db4dbc3ba3dd52ba501901b8b0ed36ff13344 Gerrit-Change-Number: 33392 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0