netifd: Fix device usage after free

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

diff --git a/system-linux.c b/system-linux.c
index 0ba729e..9ba13fd 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -310,6 +310,11 @@ static void system_set_neigh6reachabletime(struct device *dev, const char *val)
        system_set_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/base_reachable_time_ms", dev->ifname, val);
 }
 
+static void system_set_dadtransmits(struct device *dev, const char *val)
+{
+       system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits", dev->ifname, val);
+}
+
 static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz)
 {
        int fd = -1, ret = -1;
@@ -380,6 +385,12 @@ static int system_get_neigh6reachabletime(struct device *dev, char *buf, const s
                        dev->ifname, buf, buf_sz);
 }
 
+static int system_get_dadtransmits(struct device *dev, char *buf, const size_t buf_sz)
+{
+       return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits",
+                       dev->ifname, buf, buf_sz);
+}
+
 // Evaluate netlink messages
 static int cb_rtnl_event(struct nl_msg *msg, void *arg)
 {
@@ -791,6 +802,7 @@ sec_to_jiffies(int val)
 
 int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
 {
+       char buf[64];
        unsigned long args[4] = {};
 
        if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0)
@@ -810,6 +822,10 @@ int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
        system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier",
                bridge->ifname, cfg->multicast_querier ? "1" : "0");
 
+       snprintf(buf, sizeof(buf), "%i", cfg->hash_max);
+       system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/hash_max",
+               bridge->ifname, buf);
+
        args[0] = BRCTL_SET_BRIDGE_PRIORITY;
        args[1] = cfg->priority;
        system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
@@ -1014,6 +1030,10 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
                s->flags |= DEV_OPT_MTU;
        }
 
+       s->mtu6 = system_update_ipv6_mtu(dev, 0);
+       if (s->mtu6 > 0)
+               s->flags |= DEV_OPT_MTU6;
+
        if (ioctl(sock_ioctl, SIOCGIFTXQLEN, &ifr) == 0) {
                s->txqueuelen = ifr.ifr_qlen;
                s->flags |= DEV_OPT_TXQUEUELEN;
@@ -1063,6 +1083,11 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
                s->neigh6reachabletime = strtoul(buf, NULL, 0);
                s->flags |= DEV_OPT_NEIGHREACHABLETIME;
        }
+
+       if (!system_get_dadtransmits(dev, buf, sizeof(buf))) {
+               s->dadtransmits = strtoul(buf, NULL, 0);
+               s->flags |= DEV_OPT_DADTRANSMITS;
+       }
 }
 
 static void
@@ -1101,6 +1126,7 @@ void
 system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned int apply_mask)
 {
        struct ifreq ifr;
+       char buf[12];
 
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
@@ -1109,6 +1135,9 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
                if (ioctl(sock_ioctl, SIOCSIFMTU, &ifr) < 0)
                        s->flags &= ~DEV_OPT_MTU;
        }
+       if (s->flags & DEV_OPT_MTU6 & apply_mask) {
+               system_update_ipv6_mtu(dev, s->mtu6);
+       }
        if (s->flags & DEV_OPT_TXQUEUELEN & apply_mask) {
                ifr.ifr_qlen = s->txqueuelen;
                if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
@@ -1128,33 +1157,29 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
                        s->flags &= ~DEV_OPT_PROMISC;
        }
        if (s->flags & DEV_OPT_RPFILTER & apply_mask) {
-               char buf[2];
-
                snprintf(buf, sizeof(buf), "%d", s->rpfilter);
                system_set_rpfilter(dev, buf);
        }
        if (s->flags & DEV_OPT_ACCEPTLOCAL & apply_mask)
                system_set_acceptlocal(dev, s->acceptlocal ? "1" : "0");
        if (s->flags & DEV_OPT_IGMPVERSION & apply_mask) {
-               char buf[2];
-
                snprintf(buf, sizeof(buf), "%d", s->igmpversion);
                system_set_igmpversion(dev, buf);
        }
        if (s->flags & DEV_OPT_MLDVERSION & apply_mask) {
-               char buf[2];
-
                snprintf(buf, sizeof(buf), "%d", s->mldversion);
                system_set_mldversion(dev, buf);
        }
        if (s->flags & DEV_OPT_NEIGHREACHABLETIME & apply_mask) {
-               char buf[12];
-
                snprintf(buf, sizeof(buf), "%d", s->neigh4reachabletime);
                system_set_neigh4reachabletime(dev, buf);
                snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime);
                system_set_neigh6reachabletime(dev, buf);
        }
+       if (s->flags & DEV_OPT_DADTRANSMITS & apply_mask) {
+               snprintf(buf, sizeof(buf), "%d", s->dadtransmits);
+               system_set_dadtransmits(dev, buf);
+       }
 
        system_if_apply_rps_xps(dev, s);
 }
@@ -2158,19 +2183,18 @@ int system_update_ipv6_mtu(struct device *dev, int mtu)
                        dev->ifname);
 
        int fd = open(buf, O_RDWR);
-       ssize_t len = read(fd, buf, sizeof(buf) - 1);
-       if (len < 0)
-               goto out;
-
-       buf[len] = 0;
-       ret = atoi(buf);
 
-       if (!mtu || ret <= mtu)
-               goto out;
+       if (!mtu) {
+               ssize_t len = read(fd, buf, sizeof(buf) - 1);
+               if (len < 0)
+                       goto out;
 
-       lseek(fd, 0, SEEK_SET);
-       if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) <= 0)
-               ret = -1;
+               buf[len] = 0;
+               ret = atoi(buf);
+       } else {
+               if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) > 0)
+                       ret = mtu;
+       }
 
 out:
        close(fd);