iptables: fix regression with unintended free in need_protomatch

[project/firewall3.git] / includes.c

diff --git a/includes.c b/includes.c
index a2b37a32e09b09bad717783171c04a6807910871..d1e574c19586a93018842406a4277769ad10f5e4 100644 (file)
--- a/includes.c
+++ b/includes.c
@@ -30,52 +30,97 @@ const struct fw3_option fw3_include_opts[] = {
        { }
 };
 
+static bool
+check_include(struct fw3_state *state, struct fw3_include *include, struct uci_element *e)
+{
+       if (!include->enabled)
+               return false;
+
+       if (!include->path)
+       {
+               warn_section("include", include, e, "must specify a path");
+               return false;
+       }
+
+       if (include->type == FW3_INC_TYPE_RESTORE && !include->family)
+               warn_section("include", include, e, "does not specify a family, include will get"
+                               "loaded with both iptables-restore and ip6tables-restore!");
+
+       return true;
+}
+
+static struct fw3_include *
+fw3_alloc_include(struct fw3_state *state)
+{
+       struct fw3_include *include;
+
+       include = calloc(1, sizeof(*include));
+       if (!include)
+               return NULL;
+
+       include->enabled = true;
+
+       list_add_tail(&include->list, &state->includes);
+
+       return include;
+}
 
 void
-fw3_load_includes(struct fw3_state *state, struct uci_package *p)
+fw3_load_includes(struct fw3_state *state, struct uci_package *p,
+               struct blob_attr *a)
 {
        struct uci_section *s;
        struct uci_element *e;
        struct fw3_include *include;
+       struct blob_attr *entry;
+       unsigned rem;
 
        INIT_LIST_HEAD(&state->includes);
 
-       uci_foreach_element(&p->sections, e)
+       blob_for_each_attr(entry, a, rem)
        {
-               s = uci_to_section(e);
+               const char *type;
+               const char *name = "ubus include";
 
-               if (strcmp(s->type, "include"))
+               if (!fw3_attr_parse_name_type(entry, &name, &type))
                        continue;
 
-               include = calloc(1, sizeof(*include));
-               if (!include)
+               if (strcmp(type, "script") && strcmp(type, "restore"))
                        continue;
 
-               include->name = e->name;
-               include->enabled = true;
-
-               if (!fw3_parse_options(include, fw3_include_opts, s))
-                       warn_elem(e, "has invalid options");
+               include = fw3_alloc_include(state);
+               if (!include)
+                       continue;
 
-               if (!include->enabled)
+               if (!fw3_parse_blob_options(include, fw3_include_opts, entry, name))
                {
+                       warn_section("include", include, NULL, "skipped due to invalid options");
                        fw3_free_include(include);
                        continue;
                }
 
-               if (!include->path)
-               {
-                       warn_elem(e, "must specify a path");
+               if (!check_include(state, include, NULL))
                        fw3_free_include(include);
+       }
+
+       uci_foreach_element(&p->sections, e)
+       {
+               s = uci_to_section(e);
+
+               if (strcmp(s->type, "include"))
                        continue;
-               }
 
-               if (include->type == FW3_INC_TYPE_RESTORE && !include->family)
-                       warn_elem(e, "does not specify a family, include will get loaded "
-                                    "with both iptables-restore and ip6tables-restore!");
+               include = fw3_alloc_include(state);
+               if (!include)
+                       continue;
+
+               include->name = e->name;
+
+               if (!fw3_parse_options(include, fw3_include_opts, s))
+                       warn_elem(e, "has invalid options");
 
-               list_add_tail(&include->list, &state->includes);
-               continue;
+               if (!check_include(state, include, e))
+                       fw3_free_include(include);
        }
 }
 
@@ -95,7 +140,7 @@ print_include(struct fw3_include *include)
        }
 
        while (fgets(line, sizeof(line), f))
-               fw3_pr(line);
+               fw3_pr("%s", line);
 
        fclose(f);
 }
@@ -137,19 +182,14 @@ fw3_print_includes(struct fw3_state *state, enum fw3_family family, bool reload)
                fw3_command_close();
 }
 
+#define TEMPLATE "config() { echo \"You cannot use UCI in firewall includes!\" >&2; exit 1; }; . %s"
 
 static void
 run_include(struct fw3_include *include)
 {
        int rv;
        struct stat s;
-       const char *tmpl =
-               "config() { "
-                       "echo \"You cannot use UCI in firewall includes!\" >&2; "
-                       "exit 1; "
-               "}; . %s";
-
-       char buf[PATH_MAX + sizeof(tmpl)];
+       char buf[PATH_MAX + sizeof(TEMPLATE)];
 
        info(" * Running script '%s'", include->path);
 
@@ -159,7 +199,7 @@ run_include(struct fw3_include *include)
                return;
        }
 
-       snprintf(buf, sizeof(buf), tmpl, include->path);
+       snprintf(buf, sizeof(buf), TEMPLATE, include->path);
        rv = system(buf);
 
        if (rv)