<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13579">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add gsm48_decode_bcd_number2() from osmo-msc<br><br>gsm48_decode_bcd_number() is unable to provide proper bounds validation of<br>input and output data, hence osmo-msc's vlr.c introduced a static<br>decode_bcd_number_safe() a long time ago. Move to libosmocore.<br><br>I need to use the same function to decode an MSISDN during inter-MSC Handover,<br>instead of making it public in osmo-msc, rather deprecate the unsafe function<br>and provide a safer version for all callers. Mark the old one deprecated.<br><br>Change-Id: Idb6ae6e2f3bea11ad420dae14d021ac36d99e921<br>---<br>M include/osmocom/gsm/gsm48_ie.h<br>M src/gsm/gsm48_ie.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 33 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/13579/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm48_ie.h b/include/osmocom/gsm/gsm48_ie.h</span><br><span>index f7cc24e..71050df 100644</span><br><span>--- a/include/osmocom/gsm/gsm48_ie.h</span><br><span>+++ b/include/osmocom/gsm/gsm48_ie.h</span><br><span>@@ -13,7 +13,11 @@</span><br><span> </span><br><span> /* decode a 'called/calling/connect party BCD number' as in 10.5.4.7 */</span><br><span> int gsm48_decode_bcd_number(char *output, int output_len,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *bcd_lv, int h_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *bcd_lv, int h_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_DEPRECATED("Use gsm48_decode_bcd_number2() for improved bounds checking");</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_decode_bcd_number2(char *output, size_t output_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *bcd_lv, size_t input_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t h_len);</span><br><span> </span><br><span> /* convert a ASCII phone number to 'called/calling/connect party BCD number' */</span><br><span> int gsm48_encode_bcd_number(uint8_t *bcd_lv, uint8_t max_len,</span><br><span>diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c</span><br><span>index ffe3eba..049f5dc 100644</span><br><span>--- a/src/gsm/gsm48_ie.c</span><br><span>+++ b/src/gsm/gsm48_ie.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> '8', '9', '*', '#', 'a', 'b', 'c', '\0'</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! decode a 'called/calling/connect party BCD number' as in 10.5.4.7</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Like gsm48_decode_bcd_number2() but with less airtight bounds checking.</span><br><span> * \param[out] Caller-provided output buffer</span><br><span> * \param[in] bcd_lv Length-Value portion of to-be-decoded IE</span><br><span> * \param[in] h_len Length of an optional heder between L and V portion</span><br><span>@@ -76,6 +76,32 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Decode a 'called/calling/connect party BCD number' as in 10.5.4.7.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] output Caller-provided output buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] output_len sizeof(output).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] bcd_lv Length-Value part of to-be-decoded IE.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] input_len Size of the buffer to read the IE from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] h_len Length of an optional header between L and V parts.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return 0 in case of success, negative on error. Errors checked: no or too little input data, no or too little</span><br><span style="color: hsl(120, 100%, 40%);">+ * output buffer size, IE length exceeds input data size, decoded number exceeds size of the output buffer. The output</span><br><span style="color: hsl(120, 100%, 40%);">+ * is guaranteed to be nul terminated iff output_len > 0.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_decode_bcd_number2(char *output, size_t output_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *bcd_lv, size_t input_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t h_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (output_len < 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ *output = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+ if (input_len < 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ len = bcd_lv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (input_len < len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm48_decode_bcd_number(output, output_len, bcd_lv, h_len);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! convert a single ASCII character to call-control BCD */</span><br><span> static int asc_to_bcd(const char asc)</span><br><span> {</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 1e40af7..b8c92ce 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -307,6 +307,7 @@</span><br><span> gsm48_encode_ra;</span><br><span> gsm48_hdr_gmm_cipherable;</span><br><span> gsm48_decode_bcd_number;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm48_decode_bcd_number2;</span><br><span> gsm48_decode_bearer_cap;</span><br><span> gsm48_decode_called;</span><br><span> gsm48_decode_callerid;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13579">change 13579</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/13579"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Idb6ae6e2f3bea11ad420dae14d021ac36d99e921 </div>
<div style="display:none"> Gerrit-Change-Number: 13579 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>