September 2025 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email ) Change subject: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm() ...................................................................... m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm() Own and free the xua msg in the main m3ua_rx_snm*() as done for other message types. Change-Id: Iab795da63e65d9539a44c985d9ca85aa76d203c6 --- M src/m3ua.c 1 file changed, 23 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index 7d3945c..4af17a9 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -1005,7 +1005,7 @@ } /* received SNM message on ASP side - * This function takes ownership of xua msg passed to it. */ + * xua is owned by parent call m3ua_rx_snm() */ static int m3ua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) { struct osmo_ss7_as *as = NULL; @@ -1014,7 +1014,7 @@ rc = xua_find_as_for_asp(&as, asp, rctx_ie); if (rc) - goto ret_free; + return rc; /* report those up the stack so both other ASPs and local SCCP users can be notified */ switch (xua->hdr.msg_type) { @@ -1051,12 +1051,11 @@ rc = M3UA_ERR_UNSUPP_MSG_TYPE; } -ret_free: - xua_msg_free(xua); return rc; } -/* received SNM message on SG side */ +/* received SNM message on SG side + * xua is owned by parent call m3ua_rx_snm() */ static int m3ua_rx_snm_sg(struct osmo_ss7_asp *asp, struct xua_msg *xua) { switch (xua->hdr.msg_type) { @@ -1070,9 +1069,12 @@ return 0; } +/* received SNM message + * This function takes ownership of xua msg passed to it. */ static int m3ua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) { struct xua_msg_part *na_ie = xua_msg_find_tag(xua, M3UA_IEI_NET_APPEAR); + int rc; /* SNM only permitted in ACTIVE state */ if (asp->fi->state != XUA_ASP_S_ACTIVE) { @@ -1083,7 +1085,8 @@ } else { LOGPASP(asp, DLM3UA, LOGL_ERROR, "Rx M3UA SNM not permitted " "while ASP in state %s\n", osmo_fsm_inst_state_name(asp->fi)); - return M3UA_ERR_UNEXPECTED_MSG; + rc = M3UA_ERR_UNEXPECTED_MSG; + goto ret_free; } } @@ -1095,16 +1098,25 @@ "Unsupported 'Network Appearance' IE '0x%08x' in message type '%s', sending 'Error'.\n", na, get_value_string(m3ua_xfer_msgt_names, xua->hdr.msg_type)); if (na_ie->len != 4) - return M3UA_ERR_PARAM_FIELD_ERR; - return M3UA_ERR_INVAL_NET_APPEAR; + rc = M3UA_ERR_PARAM_FIELD_ERR; + else + rc = M3UA_ERR_INVAL_NET_APPEAR; + goto ret_free; } switch (asp->cfg.role) { case OSMO_SS7_ASP_ROLE_SG: - return m3ua_rx_snm_sg(asp, xua); + rc = m3ua_rx_snm_sg(asp, xua); + break; case OSMO_SS7_ASP_ROLE_ASP: - return m3ua_rx_snm_asp(asp, xua); + rc = m3ua_rx_snm_asp(asp, xua); + break; default: - return M3UA_ERR_UNSUPP_MSG_CLASS; + rc = M3UA_ERR_UNSUPP_MSG_CLASS; + break; } + +ret_free: + xua_msg_free(xua); + return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Iab795da63e65d9539a44c985d9ca85aa76d203c6 Gerrit-Change-Number: 41090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?usp=email ) Change subject: Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I82541612c039b1cc0191cb44d2eecdcbb07fae96 Gerrit-Change-Number: 41092 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 19:19:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 2 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Forward SCON messages in SG role

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email ) Change subject: m3ua: Forward SCON messages in SG role ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic68345688d39f5430c30e156b94b1501d77e388c Gerrit-Change-Number: 41091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 19:18:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 2 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm()

by pespin

Attention is currently required from: daniel, fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email ) Change subject: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Iab795da63e65d9539a44c985d9ca85aa76d203c6 Gerrit-Change-Number: 41090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 19:18:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 2 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind

by pespin

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind ...................................................................... Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind Change-Id: I82541612c039b1cc0191cb44d2eecdcbb07fae96 --- M include/osmocom/sigtran/protocol/mtp.h M src/sccp_internal.h M src/sccp_scmg.c M src/xua_snm.c 4 files changed, 74 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/92/41092/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?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: I82541612c039b1cc0191cb44d2eecdcbb07fae96 Gerrit-Change-Number: 41092 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Forward SCON messages in SG role

by pespin

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: m3ua: Forward SCON messages in SG role ...................................................................... m3ua: Forward SCON messages in SG role The rx handler for SG role was missing to call the already existing code to propagate state of congestion state towards ASP peers. Spec references to the feature are added in place in the code. Change-Id: Ic68345688d39f5430c30e156b94b1501d77e388c --- M src/m3ua.c M src/xua_snm.c 2 files changed, 25 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/91/41091/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?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: Ic68345688d39f5430c30e156b94b1501d77e388c Gerrit-Change-Number: 41091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm()

by pespin

Attention is currently required from: daniel, fixeria, laforge, pespin. Hello Jenkins Builder, daniel, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Code-Review+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm() ...................................................................... m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm() Own and free the xua msg in the main m3ua_rx_snm*() as done for other message types. Change-Id: Iab795da63e65d9539a44c985d9ca85aa76d203c6 --- M src/m3ua.c 1 file changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/90/41090/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?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: Iab795da63e65d9539a44c985d9ca85aa76d203c6 Gerrit-Change-Number: 41090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?usp=email ) Change subject: Propagate rx M3UA SCON -> MTP-STATUS.ind -> N-PCSTATE.ind ...................................................................... Patch Set 1: (1 comment) File include/osmocom/sigtran/protocol/mtp.h: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092/comment/e3a98409_74f9f… : PS1, Line 32: Q.705 > Did you mean `Q. […] yes! thanks. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I82541612c039b1cc0191cb44d2eecdcbb07fae96 Gerrit-Change-Number: 41092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 19:17:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Forward SCON messages in SG role

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email ) Change subject: m3ua: Forward SCON messages in SG role ...................................................................... Patch Set 1: (1 comment) File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091/comment/44378a21_7d142… : PS1, Line 1068: pe er > peer Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic68345688d39f5430c30e156b94b1501d77e388c Gerrit-Change-Number: 41091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 19:16:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm()

by pespin

Attention is currently required from: daniel, fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email ) Change subject: m3ua: Fix memleak in m3ua_rx_snm_sg() and some paths of m3ua_rx_snm() ...................................................................... Patch Set 1: (1 comment) File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090/comment/ff359c44_758ce… : PS1, Line 1013: = 0; > ack but it doesn't hurt either and makes it safer if code paths are moved below at some point. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Iab795da63e65d9539a44c985d9ca85aa76d203c6 Gerrit-Change-Number: 41090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Sep 2025 19:16:38 +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>

1 week, 2 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025