<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11689">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCLS: tighten GCR check<br><br>Use stricter checks for received Global Call Reference.<br><br>Change-Id: I9690e1b2d14e41471413bb35eb22fa6c4c4d67fd<br>Related: OS#2487<br>---<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>1 file changed, 13 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/11689/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 6b7a682..f03fb6e 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -520,19 +520,20 @@</span><br><span> static void bssmap_handle_ass_req_lcls(struct gsm_subscriber_connection *conn,</span><br><span>                                   const struct tlv_parsed *tp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       const struct tlv_p_entry *tlv;</span><br><span style="color: hsl(0, 100%, 40%);">-  const uint8_t *config, *control;</span><br><span style="color: hsl(120, 100%, 40%);">+      const uint8_t *config, *control, *gcr, gcr_len = TLVP_LEN(tp, GSM0808_IE_GLOBAL_CALL_REF);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  tlv = TLVP_GET(tp, GSM0808_IE_GLOBAL_CALL_REF);</span><br><span style="color: hsl(0, 100%, 40%);">- if (tlv) {</span><br><span style="color: hsl(0, 100%, 40%);">-              if (tlv->len > sizeof(conn->lcls.global_call_ref))</span><br><span style="color: hsl(0, 100%, 40%);">-                     LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too long\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                             tlv->len);</span><br><span style="color: hsl(0, 100%, 40%);">-           else {</span><br><span style="color: hsl(0, 100%, 40%);">-                  LOGPFSM(conn->fi, "Setting GCR to %s\n", osmo_hexdump_nospc(tlv->val, tlv->len));</span><br><span style="color: hsl(0, 100%, 40%);">-                    memcpy(&conn->lcls.global_call_ref, tlv->val, tlv->len);</span><br><span style="color: hsl(0, 100%, 40%);">-                   conn->lcls.global_call_ref_len = tlv->len;</span><br><span style="color: hsl(0, 100%, 40%);">-                }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (gcr_len > sizeof(conn->lcls.global_call_ref))</span><br><span style="color: hsl(120, 100%, 40%);">+               LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too long\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                    gcr_len);</span><br><span style="color: hsl(120, 100%, 40%);">+    else {</span><br><span style="color: hsl(120, 100%, 40%);">+                gcr = TLVP_VAL_MINLEN(tp, GSM0808_IE_GLOBAL_CALL_REF, 13);</span><br><span style="color: hsl(120, 100%, 40%);">+            if (gcr) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    LOGPFSM(conn->fi, "Setting GCR to %s\n", osmo_hexdump_nospc(gcr, gcr_len));</span><br><span style="color: hsl(120, 100%, 40%);">+                      memcpy(&conn->lcls.global_call_ref, gcr, gcr_len);</span><br><span style="color: hsl(120, 100%, 40%);">+                     conn->lcls.global_call_ref_len = gcr_len;</span><br><span style="color: hsl(120, 100%, 40%);">+          } else</span><br><span style="color: hsl(120, 100%, 40%);">+                        LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too short\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                           gcr_len);</span><br><span>   }</span><br><span> </span><br><span>        config = TLVP_VAL_MINLEN(tp, GSM0808_IE_LCLS_CONFIG, 1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11689">change 11689</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/11689"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9690e1b2d14e41471413bb35eb22fa6c4c4d67fd </div>
<div style="display:none"> Gerrit-Change-Number: 11689 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>