7 files changed, 45 insertions, 67 deletions

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 6989b22716e6..85aa42785a5e 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -330,10 +330,12 @@ extern void xt_unregister_matches(struct xt_match *match, unsigned int n);
 
 extern int xt_check_match(const struct xt_match *match, unsigned short family,
                           unsigned int size, const char *table, unsigned int hook,
-                          unsigned short proto, int inv_proto);
+                          unsigned short proto, int inv_proto,
+                          const void *entry, void *matchinfo);
 extern int xt_check_target(const struct xt_target *target, unsigned short family,
                            unsigned int size, const char *table, unsigned int hook,
-                           unsigned short proto, int inv_proto);
+                           unsigned short proto, int inv_proto,
+                           const void *entry, void *targinfo);
 
 extern struct xt_table *xt_register_table(struct net *net,
                                           struct xt_table *table,
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 7d8ead52d25f..7ee72b71d3cb 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -340,15 +340,11 @@ ebt_check_match(struct ebt_entry_match *m, struct ebt_entry *e,
         m->u.match = match;
 
         ret = xt_check_match(match, NFPROTO_BRIDGE, m->match_size,
-              name, hookmask, e->ethproto, e->invflags & EBT_IPROTO);
+              name, hookmask, e->ethproto, e->invflags & EBT_IPROTO,
+              e, m->data);
         if (ret < 0) {
                 module_put(match->me);
                 return ret;
-        } else if (match->checkentry != NULL &&
-            !match->checkentry(name, e, NULL, m->data, hookmask)) {
-                module_put(match->me);
-                BUGPRINT("match->check failed\n");
-                return -EINVAL;
         }
 
         (*cnt)++;
@@ -377,15 +373,11 @@ ebt_check_watcher(struct ebt_entry_watcher *w, struct ebt_entry *e,
         w->u.watcher = watcher;
 
         ret = xt_check_target(watcher, NFPROTO_BRIDGE, w->watcher_size,
-              name, hookmask, e->ethproto, e->invflags & EBT_IPROTO);
+              name, hookmask, e->ethproto, e->invflags & EBT_IPROTO,
+              e, w->data);
         if (ret < 0) {
                 module_put(watcher->me);
                 return ret;
-        } else if (watcher->checkentry != NULL &&
-            !watcher->checkentry(name, e, NULL, w->data, hookmask)) {
-                module_put(watcher->me);
-                BUGPRINT("watcher->check failed\n");
-                return -EINVAL;
         }
 
         (*cnt)++;
@@ -692,15 +684,11 @@ ebt_check_entry(struct ebt_entry *e, struct ebt_table_info *newinfo,
         }
 
         ret = xt_check_target(target, NFPROTO_BRIDGE, t->target_size,
-              name, hookmask, e->ethproto, e->invflags & EBT_IPROTO);
+              name, hookmask, e->ethproto, e->invflags & EBT_IPROTO,
+              e, t->data);
         if (ret < 0) {
                 module_put(target->me);
                 goto cleanup_watchers;
-        } else if (t->u.target->checkentry &&
-            !t->u.target->checkentry(name, e, NULL, t->data, hookmask)) {
-                module_put(t->u.target->me);
-                ret = -EINVAL;
-                goto cleanup_watchers;
         }
         (*cnt)++;
         return 0;
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index b4a9a1799c94..ae525a9afbec 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -465,15 +465,13 @@ static inline int check_target(struct arpt_entry *e, const char *name)
 
         ret = xt_check_target(target, NFPROTO_ARP,
                               t->u.target_size - sizeof(*t),
-                              name, e->comefrom, 0, 0);
-        if (!ret && t->u.kernel.target->checkentry
-            && !t->u.kernel.target->checkentry(name, e, target, t->data,
-                                               e->comefrom)) {
+                              name, e->comefrom, 0, 0, e, t->data);
+        if (ret < 0) {
                 duprintf("arp_tables: check failed for `%s'.\n",
                          t->u.kernel.target->name);
-                ret = -EINVAL;
+                return ret;
         }
-        return ret;
+        return 0;
 }
 
 static inline int
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 4e7c719445c2..b4c74a7a807c 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -616,17 +616,14 @@ check_match(struct ipt_entry_match *m, const char *name,
         match = m->u.kernel.match;
         ret = xt_check_match(match, AF_INET, m->u.match_size - sizeof(*m),
                              name, hookmask, ip->proto,
-                             ip->invflags & IPT_INV_PROTO);
-        if (!ret && m->u.kernel.match->checkentry
-            && !m->u.kernel.match->checkentry(name, ip, match, m->data,
-                                              hookmask)) {
+                             ip->invflags & IPT_INV_PROTO, ip, m->data);
+        if (ret < 0) {
                 duprintf("ip_tables: check failed for `%s'.\n",
                          m->u.kernel.match->name);
-                ret = -EINVAL;
+                return ret;
         }
-        if (!ret)
-                (*i)++;
-        return ret;
+        ++*i;
+        return 0;
 }
 
 static int
@@ -668,15 +665,13 @@ static int check_target(struct ipt_entry *e, const char *name)
         target = t->u.kernel.target;
         ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t),
                               name, e->comefrom, e->ip.proto,
-                              e->ip.invflags & IPT_INV_PROTO);
-        if (!ret && t->u.kernel.target->checkentry
-            && !t->u.kernel.target->checkentry(name, e, target, t->data,
-                                               e->comefrom)) {
+                              e->ip.invflags & IPT_INV_PROTO, e, t->data);
+        if (ret < 0) {
                 duprintf("ip_tables: check failed for `%s'.\n",
                          t->u.kernel.target->name);
-                ret = -EINVAL;
+                return ret;
         }
-        return ret;
+        return 0;
 }
 
 static int
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 0b4557e03431..12c41b8d365b 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -642,17 +642,14 @@ static int check_match(struct ip6t_entry_match *m, const char *name,
         match = m->u.kernel.match;
         ret = xt_check_match(match, AF_INET6, m->u.match_size - sizeof(*m),
                              name, hookmask, ipv6->proto,
-                             ipv6->invflags & IP6T_INV_PROTO);
-        if (!ret && m->u.kernel.match->checkentry
-            && !m->u.kernel.match->checkentry(name, ipv6, match, m->data,
-                                              hookmask)) {
+                             ipv6->invflags & IP6T_INV_PROTO, ipv6, m->data);
+        if (ret < 0) {
                 duprintf("ip_tables: check failed for `%s'.\n",
                          m->u.kernel.match->name);
-                ret = -EINVAL;
+                return ret;
         }
-        if (!ret)
-                (*i)++;
-        return ret;
+        ++*i;
+        return 0;
 }
 
 static int
@@ -694,15 +691,13 @@ static int check_target(struct ip6t_entry *e, const char *name)
         target = t->u.kernel.target;
         ret = xt_check_target(target, AF_INET6, t->u.target_size - sizeof(*t),
                               name, e->comefrom, e->ipv6.proto,
-                              e->ipv6.invflags & IP6T_INV_PROTO);
-        if (!ret && t->u.kernel.target->checkentry
-            && !t->u.kernel.target->checkentry(name, e, target, t->data,
-                                               e->comefrom)) {
+                              e->ipv6.invflags & IP6T_INV_PROTO, e, t->data);
+        if (ret < 0) {
                 duprintf("ip_tables: check failed for `%s'.\n",
                          t->u.kernel.target->name);
-                ret = -EINVAL;
+                return ret;
         }
-        return ret;
+        return 0;
 }
 
 static int
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 3b1fc40cc274..d1f2fb3e8f2d 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -323,7 +323,8 @@ EXPORT_SYMBOL_GPL(xt_find_revision);
 
 int xt_check_match(const struct xt_match *match, unsigned short family,
                    unsigned int size, const char *table, unsigned int hook_mask,
-                   unsigned short proto, int inv_proto)
+                   unsigned short proto, int inv_proto, const void *entry,
+                   void *matchinfo)
 {
         if (XT_ALIGN(match->matchsize) != size &&
             match->matchsize != -1) {
@@ -351,6 +352,9 @@ int xt_check_match(const struct xt_match *match, unsigned short family,
                        xt_prefix[family], match->name, match->proto);
                 return -EINVAL;
         }
+        if (match->checkentry != NULL &&
+            !match->checkentry(table, entry, match, matchinfo, hook_mask))
+                return -EINVAL;
         return 0;
 }
 EXPORT_SYMBOL_GPL(xt_check_match);
@@ -469,7 +473,8 @@ EXPORT_SYMBOL_GPL(xt_compat_match_to_user);
 
 int xt_check_target(const struct xt_target *target, unsigned short family,
                     unsigned int size, const char *table, unsigned int hook_mask,
-                    unsigned short proto, int inv_proto)
+                    unsigned short proto, int inv_proto, const void *entry,
+                    void *targinfo)
 {
         if (XT_ALIGN(target->targetsize) != size) {
                 printk("%s_tables: %s target: invalid size %Zu != %u\n",
@@ -493,6 +498,9 @@ int xt_check_target(const struct xt_target *target, unsigned short family,
                        xt_prefix[family], target->name, target->proto);
                 return -EINVAL;
         }
+        if (target->checkentry != NULL &&
+            !target->checkentry(table, entry, target, targinfo, hook_mask))
+                return -EINVAL;
         return 0;
 }
 EXPORT_SYMBOL_GPL(xt_check_target);
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index d1263b3c96c3..79ea19375caf 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -51,20 +51,12 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int
         t->u.kernel.target = target;
 
         ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t),
-                              table, hook, 0, 0);
-        if (ret) {
+                              table, hook, 0, 0, NULL, t->data);
+        if (ret < 0) {
                 module_put(t->u.kernel.target->me);
                 return ret;
         }
-        if (t->u.kernel.target->checkentry
-            && !t->u.kernel.target->checkentry(table, NULL,
-                                               t->u.kernel.target, t->data,
-                                               hook)) {
-                module_put(t->u.kernel.target->me);
-                ret = -EINVAL;
-        }
-
-        return ret;
+        return 0;
 }
 
 static void ipt_destroy_target(struct ipt_entry_target *t)