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

[S] Change in osmo-mgw[osmith/1.12.2]: client: safely handle dealloc on event dispatch

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35389?usp=email ) Change subject: client: safely handle dealloc on event dispatch ...................................................................... client: safely handle dealloc on event dispatch See also the long in-code comment. Related: OS#6302 Change-Id: I6f1c0f6a26f9cd6993dc1910a44070ec0438e636 (cherry picked from commit 43eed63b09d3d2e2b4f62a495b974346e2f2902f) --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 47 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c index 105e54b..6fbfa4d 100644 --- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c @@ -533,10 +533,42 @@ mgcp_conn_peer_name(ci->got_port_info? &ci->rtp_info : NULL), ci->notify.fi ? "" : " (not sending a notification)"); + /* Below ordering is a delicate decision: + * + * We want to + * - emit the resulting event to ci->notify.fi, + * - check whether we want to tx the next pending MGCP message. + * Both these steps may terminate (=deallocate) the ep. + * So whichever one goes first may cause a use-after-free in the other. + * + * When dispatching the FSM event, we don't get an rc indicating dealloc of the FSM -- it may deallocate and we + * cannot tell. The common mechanism for that is osmo_fsm_set_dealloc_ctx(OTC_SELECT) and query the still + * allocated FSM state after termination (here we would check 'if (ci->ep != NULL)'), but we cannot assume the + * caller has actually set up an osmo_fsm_set_dealloc_ctx(). At time of writing, e.g. osmo-hnbgw does not use + * it. + * + * In osmo_mgcpc_ep_fsm_check_state_chg_after_response(), we do get an rc: false means FSM has terminated. + * On termination, the ep emits a term event to the FSM's parent. + * That may cause the notify.fi to be terminated in turn, depending on how the caller set things up. + * So: we cannot store notify.fi before, then call osmo_mgcpc_ep_fsm_check_state_chg_after_response(), and then + * emit the event, because notify.fi may have deallocated. We cannot look up whether + * osmo_mgcpc_ep_cancel_notify() has been called, because ci may have deallocated along with ci->ep. + * + * We have to skip emitting below success event in case the ep is now terminated. + * - It may be the final DLCX OK: not a problem, osmo_mgcpc_ep_ci_dlcx() has no notify args on purpose, so we do + * make all callers not set a notify event for DLCX by design. notify.fi should always be NULL when the final + * DLCX OK terminates the local endpoint state. + * - It may also be sudden termination due to a bad problem, in which case we shouldn't emit success. + * The osmo_fsm_inst.parent_term_event should suffice as feedback to the caller. + */ + + if (osmo_mgcpc_ep_fsm_check_state_chg_after_response(ci->ep->fi) == false) { + /* false means, the ci->ep has been terminated. */ + return; + } + if (ci->notify.fi) osmo_fsm_inst_dispatch(ci->notify.fi, ci->notify.success, ci->notify.data); - - osmo_mgcpc_ep_fsm_check_state_chg_after_response(ci->ep->fi); } /*! Return the MGW's local RTP port information for this connection, i.e. the local port that MGW is receiving on, as -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35389?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I6f1c0f6a26f9cd6993dc1910a44070ec0438e636 Gerrit-Change-Number: 35389 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: mme: Introduce test TC_ue_cell_reselect_eutran_to_geran

by pespin

Attention is currently required from: daniel, osmith, pespin. Hello Jenkins Builder, daniel, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35386?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: mme: Introduce test TC_ue_cell_reselect_eutran_to_geran ...................................................................... mme: Introduce test TC_ue_cell_reselect_eutran_to_geran Initial bits to be able to test SGSN Context Request+Response emulating an UE doing cell reselection from 4G to 2G. Related: OS#6294 Change-Id: I707cb8c6b39c1440db5ccc2f02d08337b38fb564 --- M library/GTP_Templates.ttcn M mme/MME_Tests.ttcn 2 files changed, 282 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/35386/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35386?usp=email 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: I707cb8c6b39c1440db5ccc2f02d08337b38fb564 Gerrit-Change-Number: 35386 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.2]: Bump version: 1.12.1.1-dd80 → 1.12.2

by laforge

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email ) Change subject: Bump version: 1.12.1.1-dd80 → 1.12.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: If9fc21e71c218b55f210ca038316edd3b77c3a40 Gerrit-Change-Number: 35390 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 12:23:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.2]: client: safely handle dealloc on event dispatch

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35389?usp=email ) Change subject: client: safely handle dealloc on event dispatch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35389?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I6f1c0f6a26f9cd6993dc1910a44070ec0438e636 Gerrit-Change-Number: 35389 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 12:23:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: mme: Introduce test TC_ue_cell_reselect_eutran_to_geran

by osmith

Attention is currently required from: daniel, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35386?usp=email ) Change subject: mme: Introduce test TC_ue_cell_reselect_eutran_to_geran ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File mme/MME_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35386/comment/41f2b02a_a5c9… PS2, Line 621: PESPIN: you probably wanted to adjust/remove the log line here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35386?usp=email 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: I707cb8c6b39c1440db5ccc2f02d08337b38fb564 Gerrit-Change-Number: 35386 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 12:15:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.2]: Bump version: 1.12.1.1-dd80 → 1.12.2

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email ) Change subject: Bump version: 1.12.1.1-dd80 → 1.12.2 ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp-client/Makefile.am: https://gerrit.osmocom.org/c/osmo-mgw/+/35390/comment/4e796f20_b5229a1a PS1, Line 22: 13:1:1 > Should not this be `13:1:0`? No, this is only set to 0 if "any interfaces have been removed or changed since the last public release". See TODO-RELEASE. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: If9fc21e71c218b55f210ca038316edd3b77c3a40 Gerrit-Change-Number: 35390 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 12:06:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.2]: Bump version: 1.12.1.1-dd80 → 1.12.2

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email ) Change subject: Bump version: 1.12.1.1-dd80 → 1.12.2 ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp-client/Makefile.am: https://gerrit.osmocom.org/c/osmo-mgw/+/35390/comment/7ec9b0b6_bb768e27 PS1, Line 22: 13:1:1 Should not this be `13:1:0`? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: If9fc21e71c218b55f210ca038316edd3b77c3a40 Gerrit-Change-Number: 35390 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 12:04:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.2]: Bump version: 1.12.1.1-dd80 → 1.12.2

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email ) Change subject: Bump version: 1.12.1.1-dd80 → 1.12.2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: If9fc21e71c218b55f210ca038316edd3b77c3a40 Gerrit-Change-Number: 35390 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 12:03:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.2]: client: safely handle dealloc on event dispatch

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35389?usp=email ) Change subject: client: safely handle dealloc on event dispatch ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35389?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I6f1c0f6a26f9cd6993dc1910a44070ec0438e636 Gerrit-Change-Number: 35389 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 12:03:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.2]: Bump version: 1.12.1.1-dd80 → 1.12.2

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email ) Change subject: Bump version: 1.12.1.1-dd80 → 1.12.2 ...................................................................... Bump version: 1.12.1.1-dd80 → 1.12.2 Change-Id: If9fc21e71c218b55f210ca038316edd3b77c3a40 --- M debian/changelog M src/libosmo-mgcp-client/Makefile.am 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/90/35390/1 diff --git a/debian/changelog b/debian/changelog index 1e23bc2..8d96b05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-mgw (1.12.2) unstable; urgency=medium + + [ Neels Hofmeyr ] + * client: safely handle dealloc on event dispatch + + -- Oliver Smith <osmith(a)sysmocom.de> Tue, 19 Dec 2023 12:49:41 +0100 + osmo-mgw (1.12.1) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index b2bed9a..6f508ab 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -19,7 +19,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=13:0:1 +MGCP_CLIENT_LIBVERSION=13:1:1 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35390?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: If9fc21e71c218b55f210ca038316edd3b77c3a40 Gerrit-Change-Number: 35390 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023