fix use-after-free when an interface event is pending while the interface is being...

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index c100735..246d78e 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -16,6 +16,7 @@ enum {
        OPT_IPADDR,
        OPT_IP6ADDR,
        OPT_NETMASK,
+       OPT_BROADCAST,
        OPT_GATEWAY,
        OPT_IP6GW,
        OPT_DNS,
@@ -27,6 +28,7 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
        [OPT_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY },
        [OPT_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
        [OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
+       [OPT_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING },
        [OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
        [OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
        [OPT_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
@@ -140,7 +142,7 @@ parse_addr(struct interface *iface, const char *str, bool v6, int mask,
        if (ext)
                addr->flags |= DEVADDR_EXTERNAL;
 
-       vlist_add(&iface->proto_ip.addr, &addr->node);
+       vlist_add(&iface->proto_ip.addr, &addr->node, &addr->mask);
        return true;
 }
 
@@ -181,8 +183,8 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
        }
 
        route->mask = 0;
-       route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
-       vlist_add(&iface->proto_ip.route, &route->node);
+       route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+       vlist_add(&iface->proto_ip.route, &route->node, &route->mask);
 
        return true;
 }
@@ -191,27 +193,35 @@ int
 proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
 {
        struct blob_attr *tb[__OPT_MAX];
+       struct blob_attr *cur;
        const char *error;
        unsigned int netmask = 32;
        int n_v4 = 0, n_v6 = 0;
-       uint32_t broadcast = 0;
+       struct in_addr bcast = {};
 
        blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
 
-       if (tb[OPT_NETMASK]) {
-               netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
+       if ((cur = tb[OPT_NETMASK])) {
+               netmask = parse_netmask_string(blobmsg_data(cur), false);
                if (netmask > 32) {
                        error = "INVALID_NETMASK";
                        goto error;
                }
        }
 
-       if (tb[OPT_IPADDR])
-               n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false,
-                       netmask, ext, broadcast);
+       if ((cur = tb[OPT_BROADCAST])) {
+               if (!inet_pton(AF_INET, blobmsg_data(cur), &bcast)) {
+                       error = "INVALID_BROADCAST";
+                       goto error;
+               }
+       }
+
+       if ((cur = tb[OPT_IPADDR]))
+               n_v4 = parse_address_option(iface, cur, false,
+                       netmask, ext, bcast.s_addr);
 
-       if (tb[OPT_IP6ADDR])
-               n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true,
+       if ((cur = tb[OPT_IP6ADDR]))
+               n_v6 = parse_address_option(iface, cur, true,
                        netmask, ext, 0);
 
        if (!n_v4 && !n_v6) {
@@ -222,21 +232,21 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex
        if (n_v4 < 0 || n_v6 < 0)
                goto out;
 
-       if (n_v4 && tb[OPT_GATEWAY]) {
-               if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
+       if ((cur = tb[OPT_GATEWAY])) {
+               if (n_v4 && !parse_gateway_option(iface, cur, false))
                        goto out;
        }
 
-       if (n_v6 && tb[OPT_IP6GW]) {
-               if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
+       if ((cur = tb[OPT_IP6GW])) {
+               if (n_v6 && !parse_gateway_option(iface, cur, true))
                        goto out;
        }
 
-       if (tb[OPT_DNS])
-               interface_add_dns_server_list(&iface->proto_ip, tb[OPT_DNS]);
+       if ((cur = tb[OPT_DNS]))
+               interface_add_dns_server_list(&iface->proto_ip, cur);
 
-       if (tb[OPT_DNS_SEARCH])
-               interface_add_dns_search_list(&iface->proto_ip, tb[OPT_DNS_SEARCH]);
+       if ((cur = tb[OPT_DNS_SEARCH]))
+               interface_add_dns_search_list(&iface->proto_ip, cur);
 
        return 0;