<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23917">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved; Verified
Hoernchen: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: refactor parse_rsp(), fix compilation warnings<br><br>For a long time, we see this annoying -Wstringop-truncation warning:<br><br> In function ‘parse_rsp’,<br> inlined from ‘trx_ctrl_read_cb’ at trx_if.c:647:6:<br> trx_if.c:416:2: warning: ‘strncat’ output may be truncated copying<br> between 0 and 45 bytes from a string of length 1495<br> 416 | strncat(rsp->cmd, buf_in + 4, p - buf_in - 4);<br> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~<br><br>There is no real need to use strncat() in parse_rsp(), because we<br>do not concatenate any strings but simply copy TRXC response parts<br>from the input buffer to the corresponding 'name' and 'parameters'<br>buffers. Let's use memcpy() instead. This also fixes the warning.<br><br>Change-Id: Ia10adf7d76abe9a423b07e828852fbfb53b95125<br>---<br>M src/osmo-bts-trx/trx_if.c<br>1 file changed, 20 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 18c5011..ff63187 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -397,6 +397,7 @@</span><br><span> </span><br><span> static int parse_rsp(const char *buf_in, size_t len_in, struct trx_ctrl_rsp *rsp)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t nlen, plen;</span><br><span> char *p, *k;</span><br><span> </span><br><span> if (strncmp(buf_in, "RSP ", 4))</span><br><span>@@ -406,14 +407,17 @@</span><br><span> if (!(p = strchr(buf_in + 4, ' ')))</span><br><span> goto parse_err;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (p - buf_in >= sizeof(rsp->cmd)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %zu\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (long unsigned) (p - buf_in), sizeof(rsp->cmd));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Calculate length of the name part */</span><br><span style="color: hsl(120, 100%, 40%);">+ nlen = p - (buf_in + 4);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nlen >= sizeof(rsp->cmd)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_ERROR, "TRXC command name part is too long: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "%zu >= %zu\n", nlen, sizeof(rsp->cmd));</span><br><span> goto parse_err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rsp->cmd[0] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- strncat(rsp->cmd, buf_in + 4, p - buf_in - 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&rsp->cmd[0], buf_in + 4, nlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ rsp->cmd[nlen] = '\0';</span><br><span> </span><br><span> /* Now comes the status code of the response */</span><br><span> p++;</span><br><span>@@ -427,18 +431,22 @@</span><br><span> else</span><br><span> k = p + strlen(p);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(k) >= sizeof(rsp->params)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_ERROR, "params buffer too small %zu >= %zu\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strlen(k), sizeof(rsp->params));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Calculate length of the parameters part */</span><br><span style="color: hsl(120, 100%, 40%);">+ plen = strlen(k);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (plen >= sizeof(rsp->params)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_ERROR, "TRXC command parameters part is too long: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "%zu >= %zu\n", plen, sizeof(rsp->params));</span><br><span> goto parse_err;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rsp->params[0] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- strcat(rsp->params, k);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&rsp->params[0], k, plen);</span><br><span style="color: hsl(120, 100%, 40%);">+ rsp->params[plen] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> </span><br><span> parse_err:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_NOTICE, "Unknown message on ctrl port: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- buf_in);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_NOTICE, "Unknown TRXC message: %s\n", buf_in);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23917">change 23917</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-bts/+/23917"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia10adf7d76abe9a423b07e828852fbfb53b95125 </div>
<div style="display:none"> Gerrit-Change-Number: 23917 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>