<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11016">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix Classmark Update without VLR subscriber<br><br>This recent patch moves Classmark storage to the VLR subscriber, and introduced<br>a segfault when a Classmark Update is received during IMSI detach:<br><br>commit 986fe7ed18580775bed91399a1f02eae60bda251<br>change-id I27081bf6e9e017923b2d02607f7ea06beddad82a<br>Mon Sep 17 01:12:13 2018 +0200<br>"store classmark in vlr_subscr, not conn"<br><br>It assumed that we would never accept any Classmark Update messages unless we<br>also have a valid subscriber for it. Well, that is proven wrong by the<br>ttcn3-msc-test TC_imsi_detach_by_imsi(), which brings osmo-msc to its knees.<br><br>Fix: in case of no valid vlr_subscr being present, store Classmark in the conn<br>temporarily, and copy any received Classmark to VLR subscriber as soon as it<br>gets associated with the conn (if at all).<br><br>Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290<br>---<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/osmo_msc.c<br>3 files changed, 31 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 70ac934..54026f6 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -181,6 +181,10 @@</span><br><span> </span><br><span> bool waiting_for_clear_complete;</span><br><span> } a;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Temporary storage for Classmark Information for times when a connection has no VLR subscriber</span><br><span style="color: hsl(120, 100%, 40%);">+ * associated yet. It will get copied to the VLR subscriber upon msc_vlr_subscr_assoc(). */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_classmark temporary_classmark;</span><br><span> };</span><br><span> </span><br><span> </span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 564e90b..0f52d09 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -1739,6 +1739,22 @@</span><br><span> subscr->imsi, subscr->msisdn, subscr->use_count);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void update_classmark(const struct gsm_classmark *src, struct gsm_classmark *dst)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (src->classmark1_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->classmark1 = src->classmark1;</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->classmark1_set = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (src->classmark2_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->classmark2_len = src->classmark2_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(dst->classmark2, src->classmark2, sizeof(dst->classmark2));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (src->classmark3_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->classmark3_len = src->classmark3_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(dst->classmark3, src->classmark3, sizeof(dst->classmark3));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* VLR informs us that the subscriber has been associated with a conn */</span><br><span> static void msc_vlr_subscr_assoc(void *msc_conn_ref,</span><br><span> struct vlr_subscr *vsub)</span><br><span>@@ -1749,6 +1765,11 @@</span><br><span> conn->vsub = vlr_subscr_get(vsub);</span><br><span> OSMO_ASSERT(conn->vsub);</span><br><span> conn->vsub->cs.attached_via_ran = conn->via_ran;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* In case we have already received Classmark Information before the VLR Subscriber was</span><br><span style="color: hsl(120, 100%, 40%);">+ * associated with the conn: merge the new Classmark into vsub->classmark. Don't overwrite valid</span><br><span style="color: hsl(120, 100%, 40%);">+ * vsub->classmark with unset classmark, though. */</span><br><span style="color: hsl(120, 100%, 40%);">+ update_classmark(&conn->temporary_classmark, &conn->vsub->classmark);</span><br><span> }</span><br><span> </span><br><span> static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub,</span><br><span>diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c</span><br><span>index 8efa16c..3965e9b 100644</span><br><span>--- a/src/libmsc/osmo_msc.c</span><br><span>+++ b/src/libmsc/osmo_msc.c</span><br><span>@@ -147,7 +147,12 @@</span><br><span> const uint8_t *cm2, uint8_t cm2_len,</span><br><span> const uint8_t *cm3, uint8_t cm3_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_classmark *cm = &conn->vsub->classmark;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_classmark *cm;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn->vsub)</span><br><span style="color: hsl(120, 100%, 40%);">+ cm = &conn->temporary_classmark;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cm = &conn->vsub->classmark;</span><br><span> </span><br><span> if (cm2 && cm2_len) {</span><br><span> if (cm2_len > sizeof(cm->classmark2)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11016">change 11016</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11016"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290 </div>
<div style="display:none"> Gerrit-Change-Number: 11016 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>