tunnel: use strlcpy to avoid strncpy warnings

Fixes warnings about strncpy size by using strlcpy.

tunnel.c: In function ‘tnl_gen_ioctl’:
tunnel.c:145:2: warning: ‘strncpy’ specified bound
 16 equals destination size [-Wstringop-truncation]
  strncpy(ifr.ifr_name, name, IFNAMSIZ);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/tunnel.c b/ip/tunnel.c
index 948d5f7c90f6de48d2fe76f8a03a2f2d953e4155..abd9fa2ffe0c6cdfc79bcebed5fc5225fe625226 100644 (file)
--- a/ip/tunnel.c
+++ b/ip/tunnel.c
@@ -64,7 +64,7 @@ int tnl_get_ioctl(const char *basedev, void *p)
        int fd;
        int err;
 
-       strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, basedev, IFNAMSIZ);
        ifr.ifr_ifru.ifru_data = (void *)p;
 
        fd = socket(preferred_family, SOCK_DGRAM, 0);
@@ -89,9 +89,9 @@ int tnl_add_ioctl(int cmd, const char *basedev, const char *name, void *p)
        int err;
 
        if (cmd == SIOCCHGTUNNEL && name[0])
-               strncpy(ifr.ifr_name, name, IFNAMSIZ);
+               strlcpy(ifr.ifr_name, name, IFNAMSIZ);
        else
-               strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
+               strlcpy(ifr.ifr_name, basedev, IFNAMSIZ);
        ifr.ifr_ifru.ifru_data = p;
 
        fd = socket(preferred_family, SOCK_DGRAM, 0);
@@ -115,9 +115,9 @@ int tnl_del_ioctl(const char *basedev, const char *name, void *p)
        int err;
 
        if (name[0])
-               strncpy(ifr.ifr_name, name, IFNAMSIZ);
+               strlcpy(ifr.ifr_name, name, IFNAMSIZ);
        else
-               strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
+               strlcpy(ifr.ifr_name, basedev, IFNAMSIZ);
 
        ifr.ifr_ifru.ifru_data = p;
 
@@ -142,7 +142,7 @@ static int tnl_gen_ioctl(int cmd, const char *name,
        int fd;
        int err;
 
-       strncpy(ifr.ifr_name, name, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, name, IFNAMSIZ);
        ifr.ifr_ifru.ifru_data = p;
 
        fd = socket(preferred_family, SOCK_DGRAM, 0);