<p>tnt has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13963">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc: Make sure to not dereference a NULL trans<br><br>All those were identified by gcc. At this point in the code, trans is<br>NULL and so you can't call LOG_TRANS because it will try to access the<br>log_subsys field.<br><br>Instead call LOG_TRANS_CAT with manually specified category where<br>applicable (or other logging primitive depending on what the surrounding<br>code does)<br><br>Change-Id: Ia14bd28e1db570c487ad8e90e29a69208e2226f2<br>Signed-off-by: Sylvain Munaut <tnt@246tNt.com><br>---<br>M src/libmsc/gsm_04_08_cc.c<br>M src/libmsc/gsm_04_11.c<br>M src/libmsc/gsm_09_11.c<br>M src/libmsc/transaction.c<br>4 files changed, 12 insertions(+), 12 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/63/13963/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index 2869bba..7d09e0e 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -1888,7 +1888,7 @@</span><br><span> trans = trans_alloc(net, vsub, TRANS_CC,</span><br><span> TRANS_ID_UNASSIGNED, data->callref);</span><br><span> if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "No memory for trans.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DCC, LOGL_ERROR, "No memory for trans.\n");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> /* Ressource unavailable */</span><br><span> mncc_release_ind(net, NULL, data->callref,</span><br><span>@@ -2102,12 +2102,12 @@</span><br><span> int i, rc = 0;</span><br><span> </span><br><span> if (msg_type & 0x80) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_DEBUG, "MSG 0x%2x not defined for PD error\n", msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DCC, LOGL_DEBUG, "MSG 0x%2x not defined for PD error\n", msg_type);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span> if (!vsub) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "Invalid conn: no subscriber\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DCC, LOGL_ERROR, "Invalid conn: no subscriber\n");</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -2121,7 +2121,7 @@</span><br><span> TRANS_CC,</span><br><span> transaction_id, msc_cc_next_outgoing_callref());</span><br><span> if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "No memory for trans.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DCC, LOGL_ERROR, "No memory for trans.\n");</span><br><span> rc = gsm48_tx_simple(msc_a,</span><br><span> GSM48_PDISC_CC | (transaction_id << 4),</span><br><span> GSM48_MT_CC_RELEASE_COMPL);</span><br><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index 22e55dd..d5c2516 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -1008,7 +1008,7 @@</span><br><span> /* Allocate a new transaction */</span><br><span> struct gsm_trans *trans = trans_alloc(net, vsub, TRANS_SMS, tid, new_callref++);</span><br><span> if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "No memory for transaction\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DLSMS, LOGL_ERROR, "No memory for transaction\n");</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -1072,7 +1072,7 @@</span><br><span> /* Generate a new transaction ID */</span><br><span> tid = trans_assign_trans_id(net, vsub, TRANS_SMS);</span><br><span> if (tid == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "No available transaction IDs\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DLSMS, LOGL_ERROR, "No available transaction IDs\n");</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -1227,7 +1227,7 @@</span><br><span> * A transaction we created but don't know about?</span><br><span> */</span><br><span> if (!trans && (transaction_id & 0x8) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "trans_id=%x allocated by us but known "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DLSMS, LOGL_ERROR, "trans_id=%x allocated by us but known "</span><br><span> "to us anymore. We are ignoring it, maybe a CP-ERROR "</span><br><span> "from a MS?\n",</span><br><span> transaction_id);</span><br><span>diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c</span><br><span>index 984cc53..500da3a 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -135,8 +135,8 @@</span><br><span> * a supplementary service.</span><br><span> */</span><br><span> if (msg_type != GSM0480_MTYPE_REGISTER) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "Rx wrong SS/USSD message type for new transaction: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_MSC_A(msc_a, LOGL_ERROR, "Rx wrong SS/USSD message type for new transaction: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type));</span><br><span> gsm48_tx_simple(msc_a,</span><br><span> GSM48_PDISC_NC_SS | (tid << 4),</span><br><span> GSM0480_MTYPE_RELEASE_COMPLETE);</span><br><span>@@ -145,7 +145,7 @@</span><br><span> </span><br><span> trans = trans_alloc(net, vsub, TRANS_USSD, tid, new_callref++);</span><br><span> if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, " -> No memory for trans\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_MSC_A(msc_a, LOGL_ERROR, " -> No memory for trans\n");</span><br><span> gsm48_tx_simple(msc_a,</span><br><span> GSM48_PDISC_NC_SS | (tid << 4),</span><br><span> GSM0480_MTYPE_RELEASE_COMPLETE);</span><br><span>@@ -322,7 +322,7 @@</span><br><span> TRANS_ID_UNASSIGNED, gsup_msg->session_id);</span><br><span> </span><br><span> if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, " -> No memory for trans\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DMM, LOGL_ERROR, " -> No memory for trans\n");</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c</span><br><span>index d6f8c3b..161b180 100644</span><br><span>--- a/src/libmsc/transaction.c</span><br><span>+++ b/src/libmsc/transaction.c</span><br><span>@@ -131,7 +131,7 @@</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%);">+ LOG_TRANS_CAT(trans, DMSC, LOGL_ERROR, "unable to alloc transaction, invalid subscriber (NULL)\n");</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13963">change 13963</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/13963"/><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: Ia14bd28e1db570c487ad8e90e29a69208e2226f2 </div>
<div style="display:none"> Gerrit-Change-Number: 13963 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: tnt <tnt@246tNt.com> </div>