<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21454">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  dexter: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_08_08: fix NULL pointer dereference in bsc_cm_update()<br><br>MS Classmark 3 is optional, and thus can be NULL.<br><br>Change-Id: I4f1455a3db4972ea9843564b590e405c51083b47<br>Fixes: I39ae439d05562b35b2e47774dc92f8789fea1a57<br>Fixes: CID#215593 "Explicit null dereferenced"<br>---<br>M src/osmo-bsc/gsm_08_08.c<br>1 file changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 9c5cf2f..52a92c8 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -603,13 +603,15 @@</span><br><span>  }</span><br><span>    conn_update_ms_power_class(conn, rc8);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        rc = gsm48_decode_classmark3(&conn->cm3, cm3, cm3_len);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DMSC, LOGL_NOTICE, "Unable to decode classmark3 during CM Update.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-           memset(&conn->cm3, 0, sizeof(conn->cm3));</span><br><span style="color: hsl(0, 100%, 40%);">-             conn->cm3_valid = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     } else</span><br><span style="color: hsl(0, 100%, 40%);">-          conn->cm3_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+    if (cm3 != NULL && cm3_len > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+          rc = gsm48_decode_classmark3(&conn->cm3, cm3, cm3_len);</span><br><span style="color: hsl(120, 100%, 40%);">+                if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      LOGP(DMSC, LOGL_NOTICE, "Unable to decode classmark3 during CM Update.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                 memset(&conn->cm3, 0, sizeof(conn->cm3));</span><br><span style="color: hsl(120, 100%, 40%);">+                   conn->cm3_valid = false;</span><br><span style="color: hsl(120, 100%, 40%);">+           } else</span><br><span style="color: hsl(120, 100%, 40%);">+                        conn->cm3_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> </span><br><span>        if (!msc_connected(conn))</span><br><span>            return;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21454">change 21454</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-bsc/+/21454"/><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-Change-Id: I4f1455a3db4972ea9843564b590e405c51083b47 </div>
<div style="display:none"> Gerrit-Change-Number: 21454 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>