laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email )

Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction ......................................................................

ipa: Use pseudo-random number for SLS in IPA->M3UA direction

[back-port of Ia4e66d660b6057338f66a47fffc8a0d32759f733]

In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced code that would make the LSB of the file descriptor be used as SLS when passing packets from IPA in M3UA direction.

This did however not achieve sufficient entropy in real-world use cases.

In this change, we change over to allocating a pseudo-random SLS to each IPA connection at the time it is established; We then assign that SLS to each packet received on that IPA connection.

Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7 Related: SYS#6543 Closes: SYS#6802 --- M src/osmo_ss7_asp.c M stp/stp_main.c 2 files changed, 34 insertions(+), 1 deletion(-)

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve

diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index e1c197c..b017510 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -906,7 +906,9 @@ } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, ofd->fd & 0xf); + /* we simply use the lower 4 bits of the asp_id, which is initialized to a pseudo-random value upon + * connect */ + return ipa_rx_msg(asp, msg, asp->asp_id & 0xf); }

/* netif code tells us we can read something from the socket */ @@ -996,6 +998,12 @@ if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) { rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); + } else { + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { + /* we use the lower 4 bits of the asp_id feld as SLS; let's initialize it here from a + * pseudo-random value */ + asp->asp_id = rand() & 0xf; + } }

if (asp->lm && asp->lm->prim_cb) { diff --git a/stp/stp_main.c b/stp/stp_main.c index 01d1865..d630032 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -213,6 +213,8 @@ { int rc;

+ srand(time(NULL)); + tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp"); msgb_talloc_ctx_init(tall_stp_ctx, 0); osmo_init_logging2(tall_stp_ctx, &log_info);