matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Stephen Hemminger 2018-03-19 09:34:01 -07:00
parent fc9d755a3e
commit fcb18aa3d9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ip/tunnel.c
View File

@ -64,7 +64,7 @@ int tnl_get_ioctl(const char *basedev, void *p)
int fd; int fd;
int err; int err;
strncpy(ifr.ifr_name, basedev, IFNAMSIZ); strlcpy(ifr.ifr_name, basedev, IFNAMSIZ);
ifr.ifr_ifru.ifru_data = (void *)p; ifr.ifr_ifru.ifru_data = (void *)p;
fd = socket(preferred_family, SOCK_DGRAM, 0); 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; int err;
if (cmd == SIOCCHGTUNNEL && name[0]) if (cmd == SIOCCHGTUNNEL && name[0])
strncpy(ifr.ifr_name, name, IFNAMSIZ); strlcpy(ifr.ifr_name, name, IFNAMSIZ);
else else
strncpy(ifr.ifr_name, basedev, IFNAMSIZ); strlcpy(ifr.ifr_name, basedev, IFNAMSIZ);
ifr.ifr_ifru.ifru_data = p; ifr.ifr_ifru.ifru_data = p;
fd = socket(preferred_family, SOCK_DGRAM, 0); 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; int err;
if (name[0]) if (name[0])
strncpy(ifr.ifr_name, name, IFNAMSIZ); strlcpy(ifr.ifr_name, name, IFNAMSIZ);
else else
strncpy(ifr.ifr_name, basedev, IFNAMSIZ); strlcpy(ifr.ifr_name, basedev, IFNAMSIZ);
ifr.ifr_ifru.ifru_data = p; ifr.ifr_ifru.ifru_data = p;
@ -142,7 +142,7 @@ static int tnl_gen_ioctl(int cmd, const char *name,
int fd; int fd;
int err; int err;
strncpy(ifr.ifr_name, name, IFNAMSIZ); strlcpy(ifr.ifr_name, name, IFNAMSIZ);
ifr.ifr_ifru.ifru_data = p; ifr.ifr_ifru.ifru_data = p;
fd = socket(preferred_family, SOCK_DGRAM, 0); fd = socket(preferred_family, SOCK_DGRAM, 0);