system-linux: fix memory leak in system_bridge_vlan_check

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 56cce8163cefa01f4fcf81a7b59addab0960ebd7..3504a4976aacb71d024f7a060ec69a1268d0c1f9 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -54,6 +54,7 @@ enum {
        HR_TARGET,
        HR_V6,
        HR_INTERFACE,
+       HR_EXCLUDE,
        __HR_MAX
 };
 
@@ -61,6 +62,7 @@ static const struct blobmsg_policy route_policy[__HR_MAX] = {
        [HR_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
        [HR_V6] = { .name = "v6", .type = BLOBMSG_TYPE_BOOL },
        [HR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
+       [HR_EXCLUDE] = { .name = "exclude", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static int
@@ -72,6 +74,7 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        struct interface *iface = NULL;
        union if_addr a;
        bool v6 = false;
+       bool exclude = false;
 
        blobmsg_parse(route_policy, __HR_MAX, tb, blob_data(msg), blob_len(msg));
        if (!tb[HR_TARGET])
@@ -80,6 +83,9 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        if (tb[HR_V6])
                v6 = blobmsg_get_bool(tb[HR_V6]);
 
+       if (tb[HR_EXCLUDE])
+               exclude = blobmsg_get_bool(tb[HR_EXCLUDE]);
+
        if (tb[HR_INTERFACE])
                iface = vlist_find(&interfaces, blobmsg_data(tb[HR_INTERFACE]), iface, node);
 
@@ -87,8 +93,7 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(tb[HR_TARGET]), &a))
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-
-       iface = interface_ip_add_target_route(&a, v6, iface);
+       iface = interface_ip_add_target_route(&a, v6, iface, exclude);
        if (!iface)
                return UBUS_STATUS_NOT_FOUND;
 
@@ -159,14 +164,12 @@ error:
 
 enum {
        NETNS_UPDOWN_JAIL,
-       NETNS_UPDOWN_PID,
        NETNS_UPDOWN_START,
        __NETNS_UPDOWN_MAX
 };
 
 static const struct blobmsg_policy netns_updown_policy[__NETNS_UPDOWN_MAX] = {
        [NETNS_UPDOWN_JAIL] = { .name = "jail", .type = BLOBMSG_TYPE_STRING },
-       [NETNS_UPDOWN_PID] = { .name = "pid", .type = BLOBMSG_TYPE_INT32 },
        [NETNS_UPDOWN_START] = { .name = "start", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -175,23 +178,26 @@ netifd_netns_updown(struct ubus_context *ctx, struct ubus_object *obj,
                  struct ubus_request_data *req, const char *method,
                  struct blob_attr *msg)
 {
+       int target_netns_fd = ubus_request_get_caller_fd(req);
        struct blob_attr *tb[__NETNS_UPDOWN_MAX];
-       char *jail;
-       pid_t netns_pid;
        bool start;
 
-       blobmsg_parse(netns_updown_policy, __NETNS_UPDOWN_MAX, tb, blob_data(msg), blob_len(msg));
-       if (!tb[NETNS_UPDOWN_JAIL] || !tb[NETNS_UPDOWN_PID])
+       if (target_netns_fd < 0)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
+       blobmsg_parse(netns_updown_policy, __NETNS_UPDOWN_MAX, tb, blob_data(msg), blob_len(msg));
+
        start = tb[NETNS_UPDOWN_START] && blobmsg_get_bool(tb[NETNS_UPDOWN_START]);
-       jail = blobmsg_get_string(tb[NETNS_UPDOWN_JAIL]);
-       netns_pid = blobmsg_get_u32(tb[NETNS_UPDOWN_PID]);
 
-       if (start)
-               interface_start_jail(jail, netns_pid);
-       else
-               interface_stop_jail(jail, netns_pid);
+       if (start) {
+               if (!tb[NETNS_UPDOWN_JAIL])
+                       return UBUS_STATUS_INVALID_ARGUMENT;
+
+               interface_start_jail(target_netns_fd, blobmsg_get_string(tb[NETNS_UPDOWN_JAIL]));
+       } else {
+               interface_stop_jail(target_netns_fd);
+       }
+       close(target_netns_fd);
 
        return UBUS_STATUS_OK;
 }
@@ -266,7 +272,7 @@ netifd_handle_alias(struct ubus_context *ctx, struct ubus_object *obj,
        struct device *dev = NULL;
        struct blob_attr *tb[__ALIAS_ATTR_MAX];
        struct blob_attr *cur;
-       int rem;
+       size_t rem;
 
        blobmsg_parse(alias_attrs, __ALIAS_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
@@ -291,7 +297,7 @@ netifd_handle_alias(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 
 error:
-       device_free_unused(dev);
+       device_free_unused();
        return UBUS_STATUS_INVALID_ARGUMENT;
 }
 
@@ -823,8 +829,8 @@ netifd_dump_status(struct interface *iface)
        if (iface->jail)
                blobmsg_add_string(&b, "jail", iface->jail);
 
-       if (iface->jail_ifname)
-               blobmsg_add_string(&b, "jail_ifname", iface->jail_ifname);
+       if (iface->jail_device)
+               blobmsg_add_string(&b, "jail_device", iface->jail_device);
 
        if (iface->state == IFS_UP) {
                if (iface->updated) {
@@ -912,6 +918,9 @@ netifd_dump_status(struct interface *iface)
        }
 
        a = blobmsg_open_table(&b, "data");
+
+       if (iface->zone)
+               blobmsg_add_string(&b, "zone", iface->zone);
        avl_for_each_element(&iface->data, data, node)
                blobmsg_add_blob(&b, data->data);
 
@@ -1123,7 +1132,7 @@ netifd_handle_iface(struct ubus_context *ctx, struct ubus_object *obj,
 {
        struct interface *iface;
        struct blob_attr *tb;
-       int i;
+       size_t i;
 
        blobmsg_parse(&iface_policy, 1, &tb, blob_data(msg), blob_len(msg));
        if (!tb)
@@ -1149,7 +1158,7 @@ netifd_handle_iface(struct ubus_context *ctx, struct ubus_object *obj,
 static void netifd_add_iface_object(void)
 {
        struct ubus_method *methods;
-       int i;
+       size_t i;
 
        methods = calloc(1, sizeof(iface_object_methods));
        if (!methods)