<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13974">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">transaction: fix NULL-pointer dereference in trans_alloc()<br><br>Unlike LOG_TRANS_CAT(), LOG_TRANS() is not NULL-safe:<br><br>  LOG_TRANS_CAT(trans, (trans)->log_subsys, level, fmt, ##args)<br>                       ^^^^^^^^^  NULL-pointer dereference<br><br>Let's rather use generic LOGP() macro with pre-calculated logging<br>subsystem. Intentional use of LOG_TRANS_CAT() doesn't make sense<br>anyway, because the result would be uninformative:<br><br>  trans(NULL NULL callref-0x0 tid-0) ...<br><br>Change-Id: I3c373d20ebd6e96ebd57f84b74dc15a6b69c03ac<br>---<br>M include/osmocom/msc/transaction.h<br>M src/libmsc/transaction.c<br>2 files changed, 6 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/74/13974/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h</span><br><span>index 6b82390..a0aeaef 100644</span><br><span>--- a/include/osmocom/msc/transaction.h</span><br><span>+++ b/include/osmocom/msc/transaction.h</span><br><span>@@ -157,11 +157,9 @@</span><br><span> struct gsm_trans *trans_has_conn(const struct msc_a *msc_a);</span><br><span> void trans_conn_closed(const struct msc_a *msc_a);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int trans_log_subsys(const struct gsm_trans *trans)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int trans_log_subsys(enum trans_type type)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    if (!trans)</span><br><span style="color: hsl(0, 100%, 40%);">-             return DMSC;</span><br><span style="color: hsl(0, 100%, 40%);">-    switch (trans->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+     switch (type) {</span><br><span>      case TRANS_CC:</span><br><span>       case TRANS_SILENT_CALL:</span><br><span>              return DCC;</span><br><span>diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c</span><br><span>index d6f8c3b..ebdaced 100644</span><br><span>--- a/src/libmsc/transaction.c</span><br><span>+++ b/src/libmsc/transaction.c</span><br><span>@@ -127,11 +127,12 @@</span><br><span>                           enum trans_type type, uint8_t trans_id,</span><br><span>                              uint32_t callref)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    struct gsm_trans *trans = NULL; /* (NULL for LOG_TRANS() before allocation) */</span><br><span style="color: hsl(120, 100%, 40%);">+        int subsys = trans_log_subsys(type);</span><br><span style="color: hsl(120, 100%, 40%);">+  struct gsm_trans *trans;</span><br><span> </span><br><span>         /* a valid subscriber is indispensable */</span><br><span>    if (vsub == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">-             LOG_TRANS(trans, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGP(subsys, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n");</span><br><span>              return NULL;</span><br><span>         }</span><br><span> </span><br><span>@@ -142,11 +143,11 @@</span><br><span>        *trans = (struct gsm_trans){</span><br><span>                 .vsub = vsub,</span><br><span>                .type = type,</span><br><span style="color: hsl(120, 100%, 40%);">+         .log_subsys = subsys,</span><br><span>                .transaction_id = trans_id,</span><br><span>          .callref = callref,</span><br><span>          .net = net,</span><br><span>  };</span><br><span style="color: hsl(0, 100%, 40%);">-      trans->log_subsys = trans_log_subsys(trans);</span><br><span>      vlr_subscr_get(vsub, trans_vsub_use(type));</span><br><span>  llist_add_tail(&trans->entry, &net->trans_list);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13974">change 13974</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/13974"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3c373d20ebd6e96ebd57f84b74dc15a6b69c03ac </div>
<div style="display:none"> Gerrit-Change-Number: 13974 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>