<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9550">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Return proper GSUP error in case of too short IMSI<br><br>This fixes HLR_Tests.TC_gsup_sai_err_invalid_imsi<br><br>Change-Id: I4f51abdf44dfc62d7e8792341aad6dafe58923da<br>Closes: OS#3028<br>---<br>M src/hlr.c<br>1 file changed, 28 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/50/9550/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 4da7b9b..ee19795 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -338,6 +338,29 @@</span><br><span> return osmo_gsup_conn_send(conn, msg_out);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int gsup_send_err_reply(struct osmo_gsup_conn *conn, const char *imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_gsup_message_type type_in, uint8_t err_cause)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int type_err = osmo_gsup_get_err_msg_type(type_in);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message gsup_reply = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg_out;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (type_err < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "unable to determine error response for %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_message_type_name(type_in));</span><br><span style="color: hsl(120, 100%, 40%);">+ return type_err;</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%);">+ OSMO_STRLCPY_ARRAY(gsup_reply.imsi, imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_reply.message_type = type_err;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_reply.cause = err_cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ERR response");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_encode(msg_out, &gsup_reply);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "Tx %s\n", osmo_gsup_message_type_name(type_err));</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_conn_send(conn, msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg)</span><br><span> {</span><br><span> static struct osmo_gsup_message gsup;</span><br><span>@@ -349,6 +372,11 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* 3GPP TS 23.003 Section 2.2 clearly states that an IMSI with less than 5</span><br><span style="color: hsl(120, 100%, 40%);">+ * digits is impossible. Even 5 digits is a highly theoretical case */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strlen(gsup.imsi) < 5)</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsup_send_err_reply(conn, gsup.imsi, gsup.message_type, GMM_CAUSE_INV_MAND_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (gsup.message_type) {</span><br><span> /* requests sent to us */</span><br><span> case OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9550">change 9550</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/9550"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4f51abdf44dfc62d7e8792341aad6dafe58923da </div>
<div style="display:none"> Gerrit-Change-Number: 9550 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>