netfilter: xtables: mark initial tables constant

The inputted table is never modified, so should be considered const.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>

3 files changed, 9 insertions, 8 deletions

diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index c751111440f8..d32ab13e728c 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -41,7 +41,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
         return 0;
 }
 
-static struct ebt_table broute_table =
+static const struct ebt_table broute_table =
 {
         .name           = "broute",
         .table          = &initial_table,
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c
index 4b988db3cd4d..60b1a6ca7185 100644
--- a/net/bridge/netfilter/ebtable_filter.c
+++ b/net/bridge/netfilter/ebtable_filter.c
@@ -50,7 +50,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
         return 0;
 }
 
-static struct ebt_table frame_filter =
+static const struct ebt_table frame_filter =
 {
         .name           = "filter",
         .table          = &initial_table,
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 37928d5f2840..bd1c65425d4f 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1103,23 +1103,24 @@ free_newinfo:
         return ret;
 }
 
-struct ebt_table *ebt_register_table(struct net *net, struct ebt_table *table)
+struct ebt_table *
+ebt_register_table(struct net *net, const struct ebt_table *input_table)
 {
         struct ebt_table_info *newinfo;
-        struct ebt_table *t;
+        struct ebt_table *t, *table;
         struct ebt_replace_kernel *repl;
         int ret, i, countersize;
         void *p;
 
-        if (!table || !(repl = table->table) || !repl->entries ||
-            repl->entries_size == 0 ||
-            repl->counters || table->private) {
+        if (input_table == NULL || (repl = input_table->table) == NULL ||
+            repl->entries == 0 || repl->entries_size == 0 ||
+            repl->counters != NULL || input_table->private != NULL) {
                 BUGPRINT("Bad table data for ebt_register_table!!!\n");
                 return ERR_PTR(-EINVAL);
         }
 
         /* Don't add one table to multiple lists. */
-        table = kmemdup(table, sizeof(struct ebt_table), GFP_KERNEL);
+        table = kmemdup(input_table, sizeof(struct ebt_table), GFP_KERNEL);
         if (!table) {
                 ret = -ENOMEM;
                 goto out;