<p>dexter <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11373">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm0808: allow decoding of zero length speech codec lists.<br><br>3GPP_TS_48.008, 3.2.2.103 Speech Codec List states the following:<br><br>"The length indicator (octet 2) is a binary number indicating the<br>absolute length of the contents after the length indicator.<br>The length depends on the number and type of Speech Codec Elements<br>to be included. The minimum length of one Speech Codec Element is 1<br>octet and the maximum length is 3 octets. The maximum number of<br>Speech Codec Elements within the Speech Codec List is not defined."<br><br>This clearly refers only to the length of a single speech codec<br>element but not on the overall list. So speech codec lists with<br>length 0 are indeed permitted by the spec.<br><br>- Remove the assertion that checks on zero length speech codec<br> lists.<br><br>Change-Id: I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6<br>Related: OS#3657<br>---<br>M src/gsm/gsm0808_utils.c<br>M tests/gsm0808/gsm0808_test.c<br>2 files changed, 23 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c</span><br><span>index 886f546..2348105 100644</span><br><span>--- a/src/gsm/gsm0808_utils.c</span><br><span>+++ b/src/gsm/gsm0808_utils.c</span><br><span>@@ -349,9 +349,6 @@</span><br><span> OSMO_ASSERT(msg);</span><br><span> OSMO_ASSERT(scl);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Empty list */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(scl->len >= 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> msgb_put_u8(msg, GSM0808_IE_SPEECH_CODEC_LIST);</span><br><span> tlv_len = msgb_put(msg, 1);</span><br><span> old_tail = msg->tail;</span><br><span>@@ -384,8 +381,6 @@</span><br><span> OSMO_ASSERT(scl);</span><br><span> if (!elem)</span><br><span> return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (len == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span> </span><br><span> memset(scl, 0, sizeof(*scl));</span><br><span> </span><br><span>@@ -404,11 +399,6 @@</span><br><span> </span><br><span> scl->len = decoded;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Empty list */</span><br><span style="color: hsl(0, 100%, 40%);">- if (decoded < 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return (int)(elem - old_elem);</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c</span><br><span>index 8cf1cf4..0b2794f 100644</span><br><span>--- a/tests/gsm0808/gsm0808_test.c</span><br><span>+++ b/tests/gsm0808/gsm0808_test.c</span><br><span>@@ -695,6 +695,28 @@</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void test_gsm0808_enc_dec_empty_speech_codec_list()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_speech_codec_list enc_scl = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .len = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_speech_codec_list dec_scl = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rc_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc_dec;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc(1024, "output buffer");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc_enc = gsm0808_enc_speech_codec_list(msg, &enc_scl);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc_enc == 2);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc_dec = gsm0808_dec_speech_codec_list(&dec_scl, msg->data + 2, msg->len - 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc_dec == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(memcmp(&enc_scl, &dec_scl, sizeof(enc_scl)) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</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%);">+</span><br><span> static void test_gsm0808_enc_dec_channel_type()</span><br><span> {</span><br><span> struct gsm0808_channel_type enc_ct = {</span><br><span>@@ -1725,6 +1747,7 @@</span><br><span> test_gsm0808_enc_dec_speech_codec_ext_with_cfg();</span><br><span> test_gsm0808_enc_dec_speech_codec_with_cfg();</span><br><span> test_gsm0808_enc_dec_speech_codec_list();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_gsm0808_enc_dec_empty_speech_codec_list();</span><br><span> test_gsm0808_enc_dec_channel_type();</span><br><span> test_gsm0808_enc_dec_encrypt_info();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11373">change 11373</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/11373"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 </div>
<div style="display:none"> Gerrit-Change-Number: 11373 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>