<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/13630">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/db.c: fix storing SMS with empty TP-User-Data<br><br>Thanks to db_sms_test, it was discovered that storing an SMS with<br>empty TP-User-Data (TP-UDL=1) causes buffer overruns in libdbi<br>and it's SQLite3 driver (libdbdsqlite3):<br><br> DDB NOTICE test_db_sms_store('Empty TP-UD'): ==7791== Invalid write of size 2<br> ==7791== at 0x857DC60: dbd_quote_binary (in /usr/lib/x86_64-linux-gnu/dbd/libdbdsqlite3.so)<br> ==7791== by 0x5B2B321: dbi_conn_quote_binary_copy (in /usr/lib/x86_64-linux-gnu/libdbi.so.1.1.0)<br> ==7791== by 0x4073B1: db_sms_store (db.c:701)<br> ==7791== by 0x405BB5: test_db_sms_store (db_sms_test.c:310)<br> ==7791== by 0x405BB5: main (db_sms_test.c:546)<br> ==7791== Address 0x7ed1cf0 is 0 bytes after a block of size 0 alloc'd<br> ==7791== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)<br> ==7791== by 0x857DC4B: dbd_quote_binary (in /usr/lib/x86_64-linux-gnu/dbd/libdbdsqlite3.so)<br> ==7791== by 0x5B2B321: dbi_conn_quote_binary_copy (in /usr/lib/x86_64-linux-gnu/libdbi.so.1.1.0)<br> ==7791== by 0x4073B1: db_sms_store (db.c:701)<br> ==7791== by 0x405BB5: test_db_sms_store (db_sms_test.c:310)<br> ==7791== by 0x405BB5: main (db_sms_test.c:546)<br><br> ...<br><br> DDB NOTICE test_db_sms_get('Empty TP-UD'): ==8051== Invalid read of size 1<br> ==8051== at 0x5B30510: _dbd_decode_binary (in /usr/lib/x86_64-linux-gnu/libdbi.so.1.1.0)<br> ==8051== by 0x857D957: dbd_fetch_row (in /usr/lib/x86_64-linux-gnu/dbd/libdbdsqlite3.so)<br> ==8051== by 0x5B2C86E: dbi_result_seek_row (in /usr/lib/x86_64-linux-gnu/libdbi.so.1.1.0)<br> ==8051== by 0x40828F: next_row (db.c:188)<br> ==8051== by 0x40828F: db_sms_get (db.c:805)<br> ==8051== by 0x406C29: test_db_sms_get (db_sms_test.c:390)<br> ==8051== by 0x405C14: main (db_sms_test.c:547)<br> ==8051== Address 0x8f74641 is 0 bytes after a block of size 1 alloc'd<br> ==8051== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)<br> ==8051== by 0x5DBEB49: strdup (strdup.c:42)<br> ==8051== by 0x857D93C: dbd_fetch_row (in /usr/lib/x86_64-linux-gnu/dbd/libdbdsqlite3.so)<br> ==8051== by 0x5B2C86E: dbi_result_seek_row (in /usr/lib/x86_64-linux-gnu/libdbi.so.1.1.0)<br> ==8051== by 0x40828F: next_row (db.c:188)<br> ==8051== by 0x40828F: db_sms_get (db.c:805)<br> ==8051== by 0x406C29: test_db_sms_get (db_sms_test.c:390)<br> ==8051== by 0x405C14: main (db_sms_test.c:547)<br> ==8051==<br> success, as expected<br> DDB NOTICE verify_sms('Empty TP-UD'): user_data_len mismatch: E0 vs A3<br><br>Apparently, dbi_conn_quote_binary_copy() doesn't properly handle<br>zero-length input. Let's guard against this.<br><br>Observed with:<br><br> - libdbi-dev 0.9.0-1<br> - libdbd-sqlite3:amd64 0.9.0-2ubuntu2<br><br>Change-Id: If0b2bb557118c5f0e520a2e6c2816336f6028661<br>---<br>M src/libmsc/db.c<br>M tests/db_sms/db_sms_test.c<br>M tests/db_sms/db_sms_test.err<br>3 files changed, 14 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/db.c b/src/libmsc/db.c</span><br><span>index b564697..add6304 100644</span><br><span>--- a/src/libmsc/db.c</span><br><span>+++ b/src/libmsc/db.c</span><br><span>@@ -695,14 +695,20 @@</span><br><span> {</span><br><span> dbi_result result;</span><br><span> char *q_text, *q_daddr, *q_saddr;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned char *q_udata;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned char *q_udata = NULL;</span><br><span> time_t now, validity_timestamp;</span><br><span> </span><br><span> dbi_conn_quote_string_copy(conn, (char *)sms->text, &q_text);</span><br><span> dbi_conn_quote_string_copy(conn, (char *)sms->dst.addr, &q_daddr);</span><br><span> dbi_conn_quote_string_copy(conn, (char *)sms->src.addr, &q_saddr);</span><br><span style="color: hsl(0, 100%, 40%);">- dbi_conn_quote_binary_copy(conn, sms->user_data, sms->user_data_len,</span><br><span style="color: hsl(0, 100%, 40%);">- &q_udata);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Guard against zero-length input, as this may cause</span><br><span style="color: hsl(120, 100%, 40%);">+ * buffer overruns in libdbi / libdbdsqlite3. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sms->user_data_len > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ dbi_conn_quote_binary_copy(conn, sms->user_data,</span><br><span style="color: hsl(120, 100%, 40%);">+ sms->user_data_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ &q_udata);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> now = time(NULL);</span><br><span> validity_timestamp = now + sms->validity_minutes * 60;</span><br><span>diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c</span><br><span>index 93aed2b..a97f7c7 100644</span><br><span>--- a/tests/db_sms/db_sms_test.c</span><br><span>+++ b/tests/db_sms/db_sms_test.c</span><br><span>@@ -247,8 +247,6 @@</span><br><span> },</span><br><span> .ud = &sms_tp_ud_set[0],</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: there is a bug that causes ASAN / Valgrind to complain */</span><br><span> {</span><br><span> .name = "Empty TP-UD",</span><br><span> .sms = {</span><br><span>@@ -267,7 +265,6 @@</span><br><span> },</span><br><span> .ud = NULL,</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> };</span><br><span> </span><br><span> static void prepare_sms_test_set(void)</span><br><span>diff --git a/tests/db_sms/db_sms_test.err b/tests/db_sms/db_sms_test.err</span><br><span>index 73dbd8e..e0a329d 100644</span><br><span>--- a/tests/db_sms/db_sms_test.err</span><br><span>+++ b/tests/db_sms/db_sms_test.err</span><br><span>@@ -11,6 +11,7 @@</span><br><span> DDB NOTICE test_db_sms_store('Same MSISDN #1'): success, as expected</span><br><span> DDB NOTICE test_db_sms_store('Same MSISDN #2'): success, as expected</span><br><span> DDB NOTICE test_db_sms_store('Expired SMS'): success, as expected</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE test_db_sms_store('Empty TP-UD'): success, as expected</span><br><span> DDB INFO Testing db_sms_get()...</span><br><span> DDB NOTICE test_db_sms_get('Regular MO SMS'): success, as expected</span><br><span> DDB NOTICE verify_sms('Regular MO SMS'): match</span><br><span>@@ -32,6 +33,8 @@</span><br><span> DDB NOTICE verify_sms('Same MSISDN #2'): match</span><br><span> DDB NOTICE test_db_sms_get('Expired SMS'): success, as expected</span><br><span> DDB NOTICE verify_sms('Expired SMS'): match</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Empty TP-UD'): match</span><br><span> DDB INFO Testing db_sms_get_next_unsent() and db_sms_mark_delivered()...</span><br><span> DDB NOTICE db_sms_get_next_unsent(#1): found</span><br><span> DDB NOTICE verify_sms('Regular MO SMS'): match</span><br><span>@@ -67,4 +70,6 @@</span><br><span> DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected</span><br><span> DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result</span><br><span> DDB NOTICE verify_sms('Expired SMS'): match</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Empty TP-UD'): match</span><br><span> full talloc report on 'null_context' (total 0 bytes in 1 blocks)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/13630">change 13630</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/osmo-msc/+/13630"/><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-Change-Id: If0b2bb557118c5f0e520a2e6c2816336f6028661 </div>
<div style="display:none"> Gerrit-Change-Number: 13630 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Max <suraev@alumni.ntnu.no> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>