system-linux: check ioctl return value in system_if_flags()

[project/netifd.git] / system-linux.c

diff --git a/system-linux.c b/system-linux.c
index 4f3b9b0..0b594f6 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -346,6 +346,11 @@ static void system_bridge_set_hairpin_mode(struct device *dev, const char *val)
        system_set_dev_sysctl("/sys/class/net/%s/brport/hairpin_mode", dev->ifname, val);
 }
 
+static void system_bridge_set_isolate_mode(struct device *dev, const char *val)
+{
+       system_set_dev_sysctl("/sys/class/net/%s/brport/isolate_mode", dev->ifname, val);
+}
+
 static void system_bridge_set_multicast_router(struct device *dev, const char *val, bool bridge)
 {
        system_set_dev_sysctl(bridge ? "/sys/class/net/%s/bridge/multicast_router" :
@@ -748,6 +753,10 @@ int system_bridge_addif(struct device *bridge, struct device *dev)
            !dev->settings.unicast_flood)
                system_bridge_set_unicast_flood(dev, "0");
 
+       if (dev->settings.flags & DEV_OPT_ISOLATE &&
+           dev->settings.isolate)
+               system_bridge_set_isolate_mode(dev, "1");
+
        return ret;
 }
 
@@ -772,7 +781,9 @@ static int system_if_flags(const char *ifname, unsigned add, unsigned rem)
 
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-       ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr);
+       if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) < 0)
+               return -1;
+
        ifr.ifr_flags |= add;
        ifr.ifr_flags &= ~rem;
        return ioctl(sock_ioctl, SIOCSIFFLAGS, &ifr);
@@ -1562,6 +1573,9 @@ int system_if_check(struct device *dev)
        };
        int ret = 1;
 
+       if (!cb)
+               return ret;
+
        msg = nlmsg_alloc_simple(RTM_GETLINK, 0);
        if (!msg)
                goto out;
@@ -1699,16 +1713,12 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 {
        struct ethtool_cmd ecmd;
        struct ifreq ifr;
-       char buf[64], *s;
+       char *s;
        void *c;
-       int dir_fd;
-
-       snprintf(buf, sizeof(buf), "/sys/class/net/%s", dev->ifname);
-       dir_fd = open(buf, O_DIRECTORY);
 
        memset(&ecmd, 0, sizeof(ecmd));
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev->ifname);
+       strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
        ifr.ifr_data = (caddr_t) &ecmd;
        ecmd.cmd = ETHTOOL_GSET;
 
@@ -1727,7 +1737,6 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
                blobmsg_add_string_buffer(b);
        }
 
-       close(dir_fd);
        return 0;
 }
 
@@ -2311,9 +2320,14 @@ static int system_add_ip6_tunnel(const char *name, const unsigned int link,
 
 #ifdef IFLA_IPTUN_FMR_MAX
        if ((cur = tb[TUNNEL_ATTR_DATA])) {
-               struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS);
                struct blob_attr *dcur;
                unsigned drem, fmrcnt = 0;
+               struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS);
+
+               if (!fmrs) {
+                       ret = -ENOMEM;
+                       goto failure;
+               }
 
                blobmsg_for_each_attr(dcur, cur, drem) {
                        if (blobmsg_type(dcur) != BLOBMSG_TYPE_ARRAY ||
@@ -2361,6 +2375,10 @@ static int system_add_ip6_tunnel(const char *name, const unsigned int link,
                                offset = blobmsg_get_u32(tb_cur);
 
                                struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt);
+                               if (!rule) {
+                                       ret = -ENOMEM;
+                                       goto failure;
+                               }
 
                                nla_put(nlm, IFLA_IPTUN_FMR_IP6_PREFIX, sizeof(ip6prefix), &ip6prefix);
                                nla_put(nlm, IFLA_IPTUN_FMR_IP4_PREFIX, sizeof(ip4prefix), &ip4prefix);
@@ -2815,8 +2833,10 @@ static int system_add_vxlan(const char *name, const unsigned int link, struct bl
                unsigned tos = 1;
 
                if (strcmp(str, "inherit")) {
-                       if (!system_tos_aton(str, &tos))
-                               return -EINVAL;
+                       if (!system_tos_aton(str, &tos)) {
+                               ret = -EINVAL;
+                               goto failure;
+                       }
                }
 
                nla_put_u8(msg, IFLA_VXLAN_TOS, tos);