Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10435 )

Change subject: layer23: Use osmo_strlcpy() to avoid non-terminated strings
......................................................................

layer23: Use osmo_strlcpy() to avoid non-terminated strings

settings.c:191:2: warning: ‘strncpy’ output may be truncated copying 15 bytes 
from a string of length 15 -Wstringop-truncation]
  strncpy(set->imeisv, set->imei, 15);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  CC       subscriber.o
  CC       support.o
  CC       transaction.o
  CC       vty_interface.o
  CC       voice.o
  CC       mncc_sock.o
  CC       primitives.o
mncc_sock.c: In function ‘osmo_unixsock_listen’:
mncc_sock.c:318:2: warning: ‘strncpy’ specified bound 108 equals destination 
size [-Wstringop-truncation]
  strncpy(local.sun_path, path, sizeof(local.sun_path));
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  CC       script_lua.o
vty_interface.c: In function ‘cfg_gps_device’:
vty_interface.c:1144:2: warning: ‘strncpy’ specified bound 32 equals 
destination size [-Wstringop-truncation]
  strncpy(g.device, argv[0], sizeof(g.device));
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  AR       libmobile.a

Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1
---
M src/host/layer23/src/mobile/mncc_sock.c
M src/host/layer23/src/mobile/settings.c
M src/host/layer23/src/mobile/vty_interface.c
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/host/layer23/src/mobile/mncc_sock.c 
b/src/host/layer23/src/mobile/mncc_sock.c
index 7315927..39eb7bc 100644
--- a/src/host/layer23/src/mobile/mncc_sock.c
+++ b/src/host/layer23/src/mobile/mncc_sock.c
@@ -315,7 +315,7 @@
        }

        local.sun_family = AF_UNIX;
-       strncpy(local.sun_path, path, sizeof(local.sun_path));
+       osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path));
        local.sun_path[sizeof(local.sun_path) - 1] = '\0';
        unlink(local.sun_path);

diff --git a/src/host/layer23/src/mobile/settings.c 
b/src/host/layer23/src/mobile/settings.c
index 6a7cd81..7137761 100644
--- a/src/host/layer23/src/mobile/settings.c
+++ b/src/host/layer23/src/mobile/settings.c
@@ -189,7 +189,7 @@
        sprintf(rand + 8, "%07d", layer23_random() % 10000000);

        strcpy(set->imei + 15 - digits, rand + 15 - digits);
-       strncpy(set->imeisv, set->imei, 15);
+       osmo_strlcpy(set->imeisv, set->imei, 15);

        return 0;
 }
diff --git a/src/host/layer23/src/mobile/vty_interface.c 
b/src/host/layer23/src/mobile/vty_interface.c
index ec1216f..4adcf90 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -1141,7 +1141,7 @@
        "GPS receiver\nSelect serial device\n"
        "Full path of serial device including /dev/")
 {
-       strncpy(g.device, argv[0], sizeof(g.device));
+       osmo_strlcpy(g.device, argv[0], sizeof(g.device));
        g.device[sizeof(g.device) - 1] = '\0';
        g.gps_type = GPS_TYPE_SERIAL;
        if (g.enable) {

--
To view, visit https://gerrit.osmocom.org/10435
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1
Gerrit-Change-Number: 10435
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilira...@gmail.com>

Reply via email to