<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10030">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: subscriber: Avoid calling memcpy with NULL src<br><br>Fixes: OS#3389<br><br>Change-Id: I2d1c01ed8b8d2233ced6d70972183ed4fc99007a<br>---<br>M src/gprs/gprs_subscriber.c<br>M src/gprs/sgsn_libgtp.c<br>2 files changed, 22 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/30/10030/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c</span><br><span>index 1bebc65..dfd697b 100644</span><br><span>--- a/src/gprs/gprs_subscriber.c</span><br><span>+++ b/src/gprs/gprs_subscriber.c</span><br><span>@@ -374,7 +374,11 @@</span><br><span> pdp_data->pdp_type = pdp_info->pdp_type;</span><br><span> osmo_apn_to_str(pdp_data->apn_str,</span><br><span> pdp_info->apn_enc, pdp_info->apn_enc_len);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(pdp_data->qos_subscribed, pdp_info->qos_enc, pdp_info->qos_enc_len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp_info->qos_enc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&pdp_data->qos_subscribed[0], pdp_info->qos_enc,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp_info->qos_enc_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> pdp_data->qos_subscribed_len = pdp_info->qos_enc_len;</span><br><span> </span><br><span> if (pdp_info->pdp_charg_enc && pdp_info->pdp_charg_enc_len >= sizeof(pdp_data->pdp_charg)) {</span><br><span>diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c</span><br><span>index 659392e..23b8811 100644</span><br><span>--- a/src/gprs/sgsn_libgtp.c</span><br><span>+++ b/src/gprs/sgsn_libgtp.c</span><br><span>@@ -198,18 +198,25 @@</span><br><span> pdp->eua.v[0] |= 0xf0;</span><br><span> </span><br><span> /* APN name from GMM */</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->apn_use.l = TLVP_LEN(tp, GSM48_IE_GSM_APN);</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp->apn_use.l > sizeof(pdp->apn_use.v))</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->apn_use.l = sizeof(pdp->apn_use.v);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(pdp->apn_use.v, TLVP_VAL(tp, GSM48_IE_GSM_APN),</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->apn_use.l);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(tp, GSM48_IE_GSM_APN)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->apn_use.l = TLVP_LEN(tp, GSM48_IE_GSM_APN);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->apn_use.l > sizeof(pdp->apn_use.v))</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->apn_use.l = sizeof(pdp->apn_use.v);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(pdp->apn_use.v, TLVP_VAL(tp, GSM48_IE_GSM_APN), pdp->apn_use.l);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->apn_use.l = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Protocol Configuration Options from GMM */</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->pco_req.l = TLVP_LEN(tp, GSM48_IE_GSM_PROTO_CONF_OPT);</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp->pco_req.l > sizeof(pdp->pco_req.v))</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->pco_req.l = sizeof(pdp->pco_req.v);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(pdp->pco_req.v, TLVP_VAL(tp, GSM48_IE_GSM_PROTO_CONF_OPT),</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->pco_req.l);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(tp, GSM48_IE_GSM_PROTO_CONF_OPT)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->pco_req.l = TLVP_LEN(tp, GSM48_IE_GSM_PROTO_CONF_OPT);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->pco_req.l > sizeof(pdp->pco_req.v))</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->pco_req.l = sizeof(pdp->pco_req.v);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(pdp->pco_req.v, TLVP_VAL(tp, GSM48_IE_GSM_PROTO_CONF_OPT),</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->pco_req.l);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->pco_req.l = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* QoS options from GMM or remote */</span><br><span> if (TLVP_LEN(tp, OSMO_IE_GSM_SUB_QOS) > 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10030">change 10030</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/10030"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2d1c01ed8b8d2233ced6d70972183ed4fc99007a </div>
<div style="display:none"> Gerrit-Change-Number: 10030 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>