<p>keith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/20532">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
keith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix vty PDP lookups by IMSI<br><br>The PDP context is searched on the hash which is generated<br>on context creation from the IMSI in gtp format. - A hash<br>created from "human-readable" IMSI does not match.<br>Check user input for length then convert the IMSI to gtp format<br>before continuing.<br><br>Change-Id: Icd2e2bc6068c06fbf5d5fe905ebcda8954f33f04<br>---<br>M ggsn/ggsn_vty.c<br>M gtp/gtp.c<br>M gtp/gtp.h<br>3 files changed, 21 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c</span><br><span>index cb92a8a..91ffe4e 100644</span><br><span>--- a/ggsn/ggsn_vty.c</span><br><span>+++ b/ggsn/ggsn_vty.c</span><br><span>@@ -894,7 +894,12 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- imsi = strtoull(argv[1], NULL, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strlen(argv[1]) < 6 || strlen(argv[1]) > 15) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Invalid IMSI '%s'%s", argv[1], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ imsi = imsi_str2gtp(argv[1]);</span><br><span> </span><br><span> if (argc > 2) {</span><br><span> nsapi = atoi(argv[2]);</span><br><span>diff --git a/gtp/gtp.c b/gtp/gtp.c</span><br><span>index ec83041..d4c83d9 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -3492,3 +3492,17 @@</span><br><span> buf[j++] = '\0';</span><br><span> return buf;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Encode an IMSI with gtp encoding according to TS 29.060 - the</span><br><span style="color: hsl(120, 100%, 40%);">+ reverse of imsi_gtp2str(). The hash index used for context</span><br><span style="color: hsl(120, 100%, 40%);">+ lookups is generated from the IMSI in gtp format. User input</span><br><span style="color: hsl(120, 100%, 40%);">+ in the vty (for example) needs to be converted to match. */</span><br><span style="color: hsl(120, 100%, 40%);">+const uint64_t imsi_str2gtp(const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint64_t ret = 0xf000000000000000ull;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i, imsi_length = strlen(imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < imsi_length; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ ret |= ((uint64_t) (imsi[i] - '0')) << (i * 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>\ No newline at end of file</span><br><span>diff --git a/gtp/gtp.h b/gtp/gtp.h</span><br><span>index e03d77d..95566fa 100644</span><br><span>--- a/gtp/gtp.h</span><br><span>+++ b/gtp/gtp.h</span><br><span>@@ -441,5 +441,6 @@</span><br><span> extern int gsna2in_addr(struct in_addr *dst, struct ul16_t *gsna);</span><br><span> extern int in_addr2gsna(struct ul16_t *gsna, struct in_addr *src);</span><br><span> extern const char *imsi_gtp2str(const uint64_t *imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+extern const uint64_t imsi_str2gtp(const char *imsi);</span><br><span> </span><br><span> #endif /* !_GTP_H */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/20532">change 20532</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/c/osmo-ggsn/+/20532"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icd2e2bc6068c06fbf5d5fe905ebcda8954f33f04 </div>
<div style="display:none"> Gerrit-Change-Number: 20532 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>