]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
iplink: Kill redundant network device name checks
authorSerhey Popovych <serhe.popovych@gmail.com>
Mon, 18 Dec 2017 18:54:08 +0000 (20:54 +0200)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 19 Dec 2017 16:12:41 +0000 (08:12 -0800)
Since commit 625df645b703 (Check user supplied interface name lengths)
iplink_parse() validates network device name using check_ifname()
helpers.

Remove redundant "name" length checks from iplink_parse() callers.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
ip/iplink_vxcan.c
ip/link_veth.c

index 680f640f4ed83175796290703d65cea3aa6b47ab..c13224c3dccdf5ed6f64f60fb43eb19589772f94 100644 (file)
@@ -38,7 +38,7 @@ static int vxcan_parse_opt(struct link_util *lu, int argc, char **argv,
        char *link = NULL;
        char *type = NULL;
        int index = 0;
-       int err, len;
+       int err;
        struct rtattr *data;
        int group;
        struct ifinfomsg *ifm, *peer_ifm;
@@ -66,10 +66,8 @@ static int vxcan_parse_opt(struct link_util *lu, int argc, char **argv,
                return err;
 
        if (name) {
-               len = strlen(name) + 1;
-               if (len > IFNAMSIZ)
-                       invarg("\"name\" too long\n", *argv);
-               addattr_l(hdr, 1024, IFLA_IFNAME, name, len);
+               addattr_l(hdr, 1024,
+                         IFLA_IFNAME, name, strlen(name) + 1);
        }
 
        peer_ifm = RTA_DATA(data);
index a36882744ec7ca5966dd553548e54422ba63a0cd..fcfd1ef32d02c9b63800421163317ffdb1ad83df 100644 (file)
@@ -36,7 +36,7 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
        char *link = NULL;
        char *type = NULL;
        int index = 0;
-       int err, len;
+       int err;
        struct rtattr *data;
        int group;
        struct ifinfomsg *ifm, *peer_ifm;
@@ -64,10 +64,8 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
                return err;
 
        if (name) {
-               len = strlen(name) + 1;
-               if (len > IFNAMSIZ)
-                       invarg("\"name\" too long\n", *argv);
-               addattr_l(hdr, 1024, IFLA_IFNAME, name, len);
+               addattr_l(hdr, 1024,
+                         IFLA_IFNAME, name, strlen(name) + 1);
        }
 
        peer_ifm = RTA_DATA(data);