<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23484">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
daniel: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: fix memory leaks when receiving SNS or invalid packets<br><br>Change-Id: I8834d3f092e6cbe4f527e95e1eebd8133a386207<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_sns.c<br>M src/gb/gprs_ns2_vc_fsm.c<br>3 files changed, 25 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 507a5ac..1148d6f 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -1243,7 +1243,7 @@</span><br><span> </span><br><span> /*! Bottom-side entry-point for received NS PDU from the driver/bind</span><br><span> * \param[in] nsvc NS-VC for which the message was received</span><br><span style="color: hsl(0, 100%, 40%);">- * \param msg the received message. Ownership is trasnferred, caller must not free it!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param msg the received message. Ownership is transferred, caller must not free it!</span><br><span> * \return 0 on success; negative on error */</span><br><span> int ns2_recv_vc(struct gprs_ns2_vc *nsvc,</span><br><span> struct msgb *msg)</span><br><span>@@ -1258,8 +1258,10 @@</span><br><span> rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_PKTS_IN]);</span><br><span> rate_ctr_add(&nsvc->ctrg->ctr[NS_CTR_BYTES_IN], msg->len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->len < sizeof(struct gprs_ns_hdr))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg->len < sizeof(struct gprs_ns_hdr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto freemsg;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (nsh->pdu_type != NS_PDUT_UNITDATA)</span><br><span> LOG_NS_RX_SIGNAL(nsvc, nsh->pdu_type);</span><br><span>@@ -1273,11 +1275,10 @@</span><br><span> msgb_l2len(msg) - sizeof(*nsh)-1, 0, 0);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto freemsg;</span><br><span> }</span><br><span> /* All sub-network service related message types */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns2_sns_rx(nsvc, msg, &tp);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_sns_rx(nsvc, msg, &tp);</span><br><span> case SNS_PDUT_ACK:</span><br><span> case SNS_PDUT_ADD:</span><br><span> case SNS_PDUT_CHANGE_WEIGHT:</span><br><span>@@ -1287,14 +1288,13 @@</span><br><span> msgb_l2len(msg) - sizeof(*nsh)-5, 0, 0);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto freemsg;</span><br><span> }</span><br><span> tp.lv[NS_IE_NSEI].val = nsh->data+2;</span><br><span> tp.lv[NS_IE_NSEI].len = 2;</span><br><span> tp.lv[NS_IE_TRANS_ID].val = nsh->data+4;</span><br><span> tp.lv[NS_IE_TRANS_ID].len = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns2_sns_rx(nsvc, msg, &tp);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_sns_rx(nsvc, msg, &tp);</span><br><span> case SNS_PDUT_CONFIG_ACK:</span><br><span> case SNS_PDUT_SIZE:</span><br><span> case SNS_PDUT_SIZE_ACK:</span><br><span>@@ -1302,15 +1302,12 @@</span><br><span> msgb_l2len(msg) - sizeof(*nsh), 0, 0);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto freemsg;</span><br><span> }</span><br><span> /* All sub-network service related message types */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns2_sns_rx(nsvc, msg, &tp);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_sns_rx(nsvc, msg, &tp);</span><br><span> case NS_PDUT_UNITDATA:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns2_vc_rx(nsvc, msg, &tp);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_vc_rx(nsvc, msg, &tp);</span><br><span> default:</span><br><span> rc = ns2_tlv_parse(&tp, nsh->data,</span><br><span> msgb_l2len(msg) - sizeof(*nsh), 0, 0);</span><br><span>@@ -1320,9 +1317,10 @@</span><br><span> ns2_tx_status(nsvc, NS_CAUSE_PROTO_ERR_UNSPEC, 0, msg);</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc = ns2_vc_rx(nsvc, msg, &tp);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ return ns2_vc_rx(nsvc, msg, &tp);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+freemsg:</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 144ab21..b8c44f1 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -1614,11 +1614,13 @@</span><br><span> uint16_t nsei = nsvc->nse->nsei;</span><br><span> struct ns2_sns_state *gss;</span><br><span> struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = 0;</span><br><span> </span><br><span> if (!nse->bss_sns_fi) {</span><br><span> LOGNSVC(nsvc, LOGL_NOTICE, "Rx %s for NS Instance that has no SNS!\n",</span><br><span> get_value_string(gprs_ns_pdu_strings, nsh->pdu_type));</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> }</span><br><span> </span><br><span> /* FIXME: how to resolve SNS FSM Instance by NSEI (SGSN)? */</span><br><span>@@ -1661,10 +1663,13 @@</span><br><span> default:</span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSEI=%u Rx unknown SNS PDU type %s\n", nsei,</span><br><span> get_value_string(gprs_ns_pdu_strings, nsh->pdu_type));</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+out:</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> #include <osmocom/vty/vty.h></span><br><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index ad8d4db..a8cb570 100644</span><br><span>--- a/src/gb/gprs_ns2_vc_fsm.c</span><br><span>+++ b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>@@ -883,7 +883,8 @@</span><br><span> default:</span><br><span> LOGPFSML(fi, LOGL_ERROR, "NSEI=%u Rx unknown NS PDU type %s\n", nsvc->nse->nsei,</span><br><span> get_value_string(gprs_ns_pdu_strings, nsh->pdu_type));</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> </span><br><span> out:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23484">change 23484</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/libosmocore/+/23484"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8834d3f092e6cbe4f527e95e1eebd8133a386207 </div>
<div style="display:none"> Gerrit-Change-Number: 23484 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </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>