<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/15806">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty.c: avoid coverity BAD_SHIFT issues<br><br>Make it obvious for compilers and for coverity, that the sapi value used<br>to shift a bit for the sapi_mask is always <= 31. The sapi value is an<br>index of the value string l1sap_common_sapi_names, which has 24 entries.<br><br>Fixes: CID#205067, CID#205068<br>Change-Id: Id8be0ab67479b1f76a4f624bd3a5242e4fe59f4b<br>---<br>M src/common/vty.c<br>1 file changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/15806/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 7c043e1..a202507 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1615,7 +1615,10 @@</span><br><span>     if (!*sapi_mask)</span><br><span>             *sapi_mask = talloc(tgt, uint16_t);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- **sapi_mask |= (1 << sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (sapi <= 31)</span><br><span style="color: hsl(120, 100%, 40%);">+            **sapi_mask |= (1 << sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+     else</span><br><span style="color: hsl(120, 100%, 40%);">+          LOGP(DL1P, LOGL_ERROR, "failed to set logging filter for L1 SAPI, can't shift by %i\n", sapi);</span><br><span>         tgt->filter_map |= (1 << LOG_FLT_L1_SAPI);</span><br><span> </span><br><span>      return CMD_SUCCESS;</span><br><span>@@ -1633,7 +1636,8 @@</span><br><span>          return CMD_SUCCESS;</span><br><span> </span><br><span>      sapi_mask = (uint16_t *)tgt->filter_data[LOG_FLT_L1_SAPI];</span><br><span style="color: hsl(0, 100%, 40%);">-   *sapi_mask &= ~(1 << sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sapi <= 31) /* avoid coverity BAD_SHIFT */</span><br><span style="color: hsl(120, 100%, 40%);">+             *sapi_mask &= ~(1 << sapi);</span><br><span> </span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/15806">change 15806</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/+/15806"/><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: Id8be0ab67479b1f76a4f624bd3a5242e4fe59f4b </div>
<div style="display:none"> Gerrit-Change-Number: 15806 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>