X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=2a108e2e4ef6ad2426a1021a69dc7cf7ffc9ccf1;hp=4f3b9b06c2f1feca20792c9bbc63f201a8fc0499;hb=HEAD;hpb=8cdb17d2c58d5c3ecb57bdaf1981cd72b4948db1

diff --git a/system-linux.c b/system-linux.c
index 4f3b9b0..2a108e2 100644
--- 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" :
@@ -660,7 +665,7 @@ static int system_bridge_if(const char *bridge, struct device *dev, int cmd, voi
 		ifr.ifr_ifindex = dev->ifindex;
 	else
 		ifr.ifr_data = data;
-	strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name) - 1);
 	return ioctl(sock_ioctl, cmd, &ifr);
 }
 
@@ -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;
 }
 
@@ -759,7 +768,7 @@ int system_bridge_delif(struct device *bridge, struct device *dev)
 int system_if_resolve(struct device *dev)
 {
 	struct ifreq ifr;
-	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
 	if (!ioctl(sock_ioctl, SIOCGIFINDEX, &ifr))
 		return ifr.ifr_ifindex;
 	else
@@ -771,8 +780,10 @@ static int system_if_flags(const char *ifname, unsigned add, unsigned rem)
 	struct ifreq ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr);
+	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+	if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) < 0)
+		return -1;
+
 	ifr.ifr_flags |= add;
 	ifr.ifr_flags &= ~rem;
 	return ioctl(sock_ioctl, SIOCSIFFLAGS, &ifr);
@@ -1239,7 +1250,8 @@ static int system_vlan(struct device *dev, int id)
 		.u.name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD,
 	};
 
-	ioctl(sock_ioctl, SIOCSIFVLAN, &ifr);
+	if (ioctl(sock_ioctl, SIOCSIFVLAN, &ifr) < 0)
+		return -1;
 
 	if (id < 0) {
 		ifr.cmd = DEL_VLAN_CMD;
@@ -1321,7 +1333,7 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 	char buf[10];
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
 
 	if (ioctl(sock_ioctl, SIOCGIFMTU, &ifr) == 0) {
 		s->mtu = ifr.ifr_mtu;
@@ -1418,7 +1430,7 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
 	char buf[12];
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
 	if (s->flags & DEV_OPT_MTU & apply_mask) {
 		ifr.ifr_mtu = s->mtu;
 		if (ioctl(sock_ioctl, SIOCSIFMTU, &ifr) < 0)
@@ -1562,6 +1574,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 +1714,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) - 1);
 	ifr.ifr_data = (caddr_t) &ecmd;
 	ecmd.cmd = ETHTOOL_GSET;
 
@@ -1727,7 +1738,6 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 		blobmsg_add_string_buffer(b);
 	}
 
-	close(dir_fd);
 	return 0;
 }
 
@@ -2245,7 +2255,7 @@ static int tunnel_ioctl(const char *name, int cmd, void *p)
 	struct ifreq ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1);
 	ifr.ifr_ifru.ifru_data = p;
 	return ioctl(sock_ioctl, cmd, &ifr);
 }
@@ -2311,9 +2321,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 +2376,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 +2834,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);
@@ -2945,7 +2966,7 @@ static int system_add_proto_tunnel(const char *name, const uint8_t proto, const
 	if (p.iph.ttl && p.iph.frag_off == 0)
 		return -EINVAL;
 
-	strncpy(p.name, name, sizeof(p.name));
+	strncpy(p.name, name, sizeof(p.name) - 1);
 
 	switch (p.iph.protocol) {
 	case IPPROTO_IPIP: