<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10435">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23: Use osmo_strlcpy() to avoid non-terminated strings<br><br>settings.c:191:2: warning: ‘strncpy’ output may be truncated copying 15 bytes from a string of length 15 -Wstringop-truncation]<br>  strncpy(set->imeisv, set->imei, 15);<br>  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~<br>  CC       subscriber.o<br>  CC       support.o<br>  CC       transaction.o<br>  CC       vty_interface.o<br>  CC       voice.o<br>  CC       mncc_sock.o<br>  CC       primitives.o<br>mncc_sock.c: In function ‘osmo_unixsock_listen’:<br>mncc_sock.c:318:2: warning: ‘strncpy’ specified bound 108 equals destination size [-Wstringop-truncation]<br>  strncpy(local.sun_path, path, sizeof(local.sun_path));<br>  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~<br>  CC       script_lua.o<br>vty_interface.c: In function ‘cfg_gps_device’:<br>vty_interface.c:1144:2: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation]<br>  strncpy(g.device, argv[0], sizeof(g.device));<br>  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~<br>  AR       libmobile.a<br><br>Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1<br>---<br>M src/host/layer23/src/mobile/mncc_sock.c<br>M src/host/layer23/src/mobile/settings.c<br>M src/host/layer23/src/mobile/vty_interface.c<br>3 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c</span><br><span>index 7315927..39eb7bc 100644</span><br><span>--- a/src/host/layer23/src/mobile/mncc_sock.c</span><br><span>+++ b/src/host/layer23/src/mobile/mncc_sock.c</span><br><span>@@ -315,7 +315,7 @@</span><br><span>        }</span><br><span> </span><br><span>        local.sun_family = AF_UNIX;</span><br><span style="color: hsl(0, 100%, 40%);">-     strncpy(local.sun_path, path, sizeof(local.sun_path));</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path));</span><br><span>  local.sun_path[sizeof(local.sun_path) - 1] = '\0';</span><br><span>   unlink(local.sun_path);</span><br><span> </span><br><span>diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c</span><br><span>index 6a7cd81..7137761 100644</span><br><span>--- a/src/host/layer23/src/mobile/settings.c</span><br><span>+++ b/src/host/layer23/src/mobile/settings.c</span><br><span>@@ -189,7 +189,7 @@</span><br><span>       sprintf(rand + 8, "%07d", layer23_random() % 10000000);</span><br><span> </span><br><span>        strcpy(set->imei + 15 - digits, rand + 15 - digits);</span><br><span style="color: hsl(0, 100%, 40%);">- strncpy(set->imeisv, set->imei, 15);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_strlcpy(set->imeisv, set->imei, 15);</span><br><span> </span><br><span>  return 0;</span><br><span> }</span><br><span>diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>index ec1216f..4adcf90 100644</span><br><span>--- a/src/host/layer23/src/mobile/vty_interface.c</span><br><span>+++ b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>@@ -1141,7 +1141,7 @@</span><br><span>      "GPS receiver\nSelect serial device\n"</span><br><span>     "Full path of serial device including /dev/")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    strncpy(g.device, argv[0], sizeof(g.device));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(g.device, argv[0], sizeof(g.device));</span><br><span>   g.device[sizeof(g.device) - 1] = '\0';</span><br><span>       g.gps_type = GPS_TYPE_SERIAL;</span><br><span>        if (g.enable) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10435">change 10435</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/10435"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1 </div>
<div style="display:none"> Gerrit-Change-Number: 10435 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>