<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12437">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/sap_interface.c: fix: properly call sap_msg_free()<br><br>Passing NULL to sap_msg_free() is not only meaningless, but also<br>would result in NULL pointer dereference. We should call it in<br>successful case only, so let's fix this.<br><br>Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494<br>---<br>M src/host/layer23/src/common/sap_interface.c<br>1 file changed, 8 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c</span><br><span>index dd7737a..b39a57f 100644</span><br><span>--- a/src/host/layer23/src/common/sap_interface.c</span><br><span>+++ b/src/host/layer23/src/common/sap_interface.c</span><br><span>@@ -296,15 +296,15 @@</span><br><span> </span><br><span> static void sap_parse_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  struct sap_msg *msg = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct sap_msg *msg;</span><br><span>         if(len > ms->sap_entity.max_msg_size){</span><br><span>                 LOGP(DSAP, LOGL_ERROR, "Read more data than allowed by max_msg_size, ignoring.\n");</span><br><span>                return;</span><br><span>      }</span><br><span> </span><br><span>        msg = sap_parse_msg(data);</span><br><span style="color: hsl(0, 100%, 40%);">-      if(!msg){</span><br><span style="color: hsl(0, 100%, 40%);">-               sap_msg_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (!msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGP(DSAP, LOGL_ERROR, "Failed to parse SAP message\n");</span><br><span>           return;</span><br><span>      }</span><br><span> </span><br><span>@@ -335,7 +335,7 @@</span><br><span>  case SAP_TRANSFER_ATR_RESP:</span><br><span>          if(ms->sap_entity.sap_state != SAP_PROCESSING_ATR_REQUEST){</span><br><span>                       LOGP(DSAP, LOGL_ERROR, "got ATR resp in state: %u\n", ms->sap_entity.sap_state);</span><br><span style="color: hsl(0, 100%, 40%);">-                   return;</span><br><span style="color: hsl(120, 100%, 40%);">+                       break;</span><br><span>               }</span><br><span>            if(msg->num_params >= 2){</span><br><span>                      LOGP(DSAP, LOGL_INFO, "ATR: %s\n", osmo_hexdump(msg->params[1].value, msg->params[1].len));</span><br><span>@@ -345,11 +345,11 @@</span><br><span>  case SAP_TRANSFER_APDU_RESP:</span><br><span>                 if(ms->sap_entity.sap_state != SAP_PROCESSING_APDU_REQUEST){</span><br><span>                      LOGP(DSAP, LOGL_ERROR, "got APDU resp in state: %u\n", ms->sap_entity.sap_state);</span><br><span style="color: hsl(0, 100%, 40%);">-                  return;</span><br><span style="color: hsl(120, 100%, 40%);">+                       break;</span><br><span>               }</span><br><span>            if(msg->num_params != 2){</span><br><span>                         LOGP(DSAP, LOGL_ERROR, "wrong number of parameters %u in APDU response\n", msg->num_params);</span><br><span style="color: hsl(0, 100%, 40%);">-                       return;</span><br><span style="color: hsl(120, 100%, 40%);">+                       break;</span><br><span>               }</span><br><span>            ms->sap_entity.sap_state = SAP_IDLE;</span><br><span>              if(sap_parse_result(&msg->params[0]) == 0){</span><br><span>@@ -369,6 +369,8 @@</span><br><span>             LOGP(DSAP, LOGL_ERROR, "got unknown or not implemented SAP msgid: %u\n", msg->id);</span><br><span>              break;</span><br><span>       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   sap_msg_free(msg);</span><br><span> }</span><br><span> </span><br><span> static int sap_read(struct osmo_fd *fd)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12437">change 12437</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/12437"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 </div>
<div style="display:none"> Gerrit-Change-Number: 12437 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>