<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13637">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">smpp: Fix SMS-receiver put assertion<br><br>Catched by osmo-gsm-tester smpp/esme_ms_sms_transaction.py<br><br>In sms_free(), if sms->receiver is set, then VSUB_USE_SMS_RECEIVER is<br>put. However, If sms comes from SMPP (ESME), dest was being referenced<br>in smpp_openbsc.c:submit_to_sms by means of VSUB_USE_SMPP.<br><br>As a result, during sms_free(), following assertion was triggered:<br>DREF  gsm_04_11.c:74 VLR subscr IMSI-901700000015252:MSISDN-7846:TMSI-0x2A74BA76 - SMS-receiver: now used by 3 (attached,SMPP,SMS,conn,-1*SMS-receiver)<br>Assert failed _osmo_use_count_get_put(&(sms->receiver)->use_count, "SMS-receiver", -1, "gsm_04_11.c", 74) == 0 gsm_04_11.c:74<br><br>Solve it by dropping reference to VSUB_USE_SMPP and referencing<br>VSUB_USE_SMS_RECEIVER once we are done using dest in SMPP code and store<br>it in sms->receiver.<br><br>Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb ("vlr_subscr: use osmo_use_count")<br>Change-Id: Ida8628c3c0569a2e3bd66c591d57eb93bf1fab14<br>---<br>M src/libmsc/smpp_openbsc.c<br>1 file changed, 5 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/13637/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c</span><br><span>index 01c39f9..25d649b 100644</span><br><span>--- a/src/libmsc/smpp_openbsc.c</span><br><span>+++ b/src/libmsc/smpp_openbsc.c</span><br><span>@@ -151,7 +151,6 @@</span><br><span>   sms->msg_ref = msg_ref;</span><br><span> </span><br><span>       /* fill in the destination address */</span><br><span style="color: hsl(0, 100%, 40%);">-   sms->receiver = dest;</span><br><span>     sms->dst.ton = submit->dest_addr_ton;</span><br><span>  sms->dst.npi = submit->dest_addr_npi;</span><br><span>  if (dest)</span><br><span>@@ -159,6 +158,11 @@</span><br><span>     else</span><br><span>                 OSMO_STRLCPY_ARRAY(sms->dst.addr,</span><br><span>                                    (const char *)submit->destination_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+        if (dest) {</span><br><span style="color: hsl(120, 100%, 40%);">+           sms->receiver = dest;</span><br><span style="color: hsl(120, 100%, 40%);">+              vlr_subscr_get(sms->receiver, VSUB_USE_SMS_RECEIVER);</span><br><span style="color: hsl(120, 100%, 40%);">+              vlr_subscr_put(dest, VSUB_USE_SMPP);</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span> </span><br><span>        /* fill in the source address */</span><br><span>     sms->src.ton = submit->source_addr_ton;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13637">change 13637</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/13637"/><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: Ida8628c3c0569a2e3bd66c591d57eb93bf1fab14 </div>
<div style="display:none"> Gerrit-Change-Number: 13637 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>