<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21917">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbsp: Fix encoding of "ETWS Warning Security Info" IE<br><br>This is a fixed-length Tag-Value IE.  Our decoder already parsed<br>it correctly, but the encoder encoded it as TLV, which is wrong.<br><br>Change-Id: I7e1d7eab8b8e51acd9a24c38e2d3d30bbf00847a<br>---<br>M src/gsm/cbsp.c<br>1 file changed, 5 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c</span><br><span>index b89358d..6ddef33 100644</span><br><span>--- a/src/gsm/cbsp.c</span><br><span>+++ b/src/gsm/cbsp.c</span><br><span>@@ -177,12 +177,15 @@</span><br><span>          }</span><br><span>    } else {</span><br><span>             int wperiod = encode_wperiod(in->u.emergency.warning_period);</span><br><span style="color: hsl(120, 100%, 40%);">+              uint8_t *cur;</span><br><span>                if (wperiod < 0)</span><br><span>                  return -EINVAL;</span><br><span>              msgb_tv_put(msg, CBSP_IEI_EMERG_IND, in->u.emergency.indicator);</span><br><span>          msgb_tv16_put(msg, CBSP_IEI_WARN_TYPE, in->u.emergency.warning_type);</span><br><span style="color: hsl(0, 100%, 40%);">-                msgb_tlv_put(msg, CBSP_IEI_WARN_SEC_INFO, sizeof(in->u.emergency.warning_sec_info),</span><br><span style="color: hsl(0, 100%, 40%);">-                       in->u.emergency.warning_sec_info);</span><br><span style="color: hsl(120, 100%, 40%);">+            /* Tag + fixed length value! */</span><br><span style="color: hsl(120, 100%, 40%);">+               msgb_put_u8(msg, CBSP_IEI_WARN_SEC_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+             cur = msgb_put(msg, sizeof(in->u.emergency.warning_sec_info));</span><br><span style="color: hsl(120, 100%, 40%);">+             memcpy(cur, in->u.emergency.warning_sec_info, sizeof(in->u.emergency.warning_sec_info));</span><br><span>               msgb_tv_put(msg, CBSP_IEI_WARNING_PERIOD, wperiod);</span><br><span>  }</span><br><span>    return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21917">change 21917</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/+/21917"/><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: I7e1d7eab8b8e51acd9a24c38e2d3d30bbf00847a </div>
<div style="display:none"> Gerrit-Change-Number: 21917 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>