Merge branch 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / ip / iplink.c

diff --git a/ip/iplink.c b/ip/iplink.c
index 29b7062f6aa4b2a86e8106b9781069ad2c221ecc..22afe0221f3c8a109d2809ce4bb33cff9d6ec125 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -1127,7 +1127,7 @@ static int do_chflags(const char *dev, __u32 flags, __u32 mask)
        int fd;
        int err;
 
-       strncpy(ifr.ifr_name, dev, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, dev, IFNAMSIZ);
        fd = get_ctl_fd();
        if (fd < 0)
                return -1;
@@ -1154,8 +1154,8 @@ static int do_changename(const char *dev, const char *newdev)
        int fd;
        int err;
 
-       strncpy(ifr.ifr_name, dev, IFNAMSIZ);
-       strncpy(ifr.ifr_newname, newdev, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, dev, IFNAMSIZ);
+       strlcpy(ifr.ifr_newname, newdev, IFNAMSIZ);
        fd = get_ctl_fd();
        if (fd < 0)
                return -1;
@@ -1178,7 +1178,7 @@ static int set_qlen(const char *dev, int qlen)
        if (s < 0)
                return -1;
 
-       strncpy(ifr.ifr_name, dev, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, dev, IFNAMSIZ);
        if (ioctl(s, SIOCSIFTXQLEN, &ifr) < 0) {
                perror("SIOCSIFXQLEN");
                close(s);
@@ -1198,7 +1198,7 @@ static int set_mtu(const char *dev, int mtu)
        if (s < 0)
                return -1;
 
-       strncpy(ifr.ifr_name, dev, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, dev, IFNAMSIZ);
        if (ioctl(s, SIOCSIFMTU, &ifr) < 0) {
                perror("SIOCSIFMTU");
                close(s);
@@ -1225,7 +1225,7 @@ static int get_address(const char *dev, int *htype)
                return -1;
        }
 
-       strncpy(ifr.ifr_name, dev, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, dev, IFNAMSIZ);
        if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
                perror("SIOCGIFINDEX");
                close(s);
@@ -1256,7 +1256,7 @@ static int parse_address(const char *dev, int hatype, int halen,
        int alen;
 
        memset(ifr, 0, sizeof(*ifr));
-       strncpy(ifr->ifr_name, dev, IFNAMSIZ);
+       strlcpy(ifr->ifr_name, dev, IFNAMSIZ);
        ifr->ifr_hwaddr.sa_family = hatype;
        alen = ll_addr_a2n(ifr->ifr_hwaddr.sa_data, 14, lla);
        if (alen < 0)