<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10177">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix strncpy bugs in ipaccess.c, ipa_proxy.c<br><br>Change-Id: Iad53b603521c0a8f4857bd87dca777ba8e875cde<br>---<br>M src/input/ipaccess.c<br>M src/ipa_proxy.c<br>2 files changed, 6 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/77/10177/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c</span><br><span>index 23eeda6..7d3845e 100644</span><br><span>--- a/src/input/ipaccess.c</span><br><span>+++ b/src/input/ipaccess.c</span><br><span>@@ -602,19 +602,19 @@</span><br><span>                   break;</span><br><span>               case IPAC_IDTAG_LOCATION1:</span><br><span>                   if (dev->location1)</span><br><span style="color: hsl(0, 100%, 40%);">-                          strncpy(str, dev->location1, IPA_STRING_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+                              osmo_strlcpy(str, dev->swversion, sizeof(str));</span><br><span>                   break;</span><br><span>               case IPAC_IDTAG_LOCATION2:</span><br><span>                   if (dev->location2)</span><br><span style="color: hsl(0, 100%, 40%);">-                          strncpy(str, dev->location2, IPA_STRING_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+                              osmo_strlcpy(str, dev->swversion, sizeof(str));</span><br><span>                   break;</span><br><span>               case IPAC_IDTAG_EQUIPVERS:</span><br><span>                   if (dev->equipvers)</span><br><span style="color: hsl(0, 100%, 40%);">-                          strncpy(str, dev->equipvers, IPA_STRING_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+                              osmo_strlcpy(str, dev->swversion, sizeof(str));</span><br><span>                   break;</span><br><span>               case IPAC_IDTAG_SWVERSION:</span><br><span>                   if (dev->swversion)</span><br><span style="color: hsl(0, 100%, 40%);">-                          strncpy(str, dev->swversion, IPA_STRING_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+                              osmo_strlcpy(str, dev->swversion, sizeof(str));</span><br><span>                   break;</span><br><span>               case IPAC_IDTAG_UNITNAME:</span><br><span>                    snprintf(str, sizeof(str),</span><br><span>@@ -626,7 +626,7 @@</span><br><span>                     break;</span><br><span>               case IPAC_IDTAG_SERNR:</span><br><span>                       if (dev->serno)</span><br><span style="color: hsl(0, 100%, 40%);">-                              strncpy(str, dev->serno, IPA_STRING_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+                          osmo_strlcpy(str, dev->swversion, sizeof(str));</span><br><span>                   break;</span><br><span>               default:</span><br><span>                     LOGP(DLINP, LOGL_NOTICE,</span><br><span>@@ -634,7 +634,6 @@</span><br><span>                       msgb_free(nmsg);</span><br><span>                     return NULL;</span><br><span>                 }</span><br><span style="color: hsl(0, 100%, 40%);">-               str[IPA_STRING_MAX-1] = '\0';</span><br><span> </span><br><span>            LOGP(DLINP, LOGL_INFO, " tag %d: %s\n", data[1], str);</span><br><span>             tag = msgb_put(nmsg, 3 + strlen(str) + 1);</span><br><span>diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c</span><br><span>index 94f48dc..44f5baf 100644</span><br><span>--- a/src/ipa_proxy.c</span><br><span>+++ b/src/ipa_proxy.c</span><br><span>@@ -245,8 +245,7 @@</span><br><span>                    VTY_NEWLINE);</span><br><span>                return CMD_WARNING;</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       strncpy(ipi->name, argv[0], IPA_INSTANCE_NAME);</span><br><span style="color: hsl(0, 100%, 40%);">-      ipi->name[IPA_INSTANCE_NAME - 1] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_strlcpy(ipi->name, argv[0], sizeof(ipi->name));</span><br><span>   ipi->net.type = type;</span><br><span>     ipi->net.addr = talloc_strdup(tall_ipa_proxy_ctx, argv[2]);</span><br><span>       ipi->net.port = port;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10177">change 10177</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/10177"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iad53b603521c0a8f4857bd87dca777ba8e875cde </div>
<div style="display:none"> Gerrit-Change-Number: 10177 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>