[NETFILTER]: x_tables: make xt_compat_match_from_user usable in iterator macros

Make xt_compat_match_from_user return an int to make it usable in the
*tables iterator macros and kill a now unnecessary wrapper function.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 6 insertions, 16 deletions

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index e305f2d0d4d1..616e6f4ede59 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -382,8 +382,8 @@ extern void xt_compat_lock(int af);
 extern void xt_compat_unlock(int af);
 
 extern int xt_compat_match_offset(struct xt_match *match);
-extern void xt_compat_match_from_user(struct xt_entry_match *m,
-                                      void **dstptr, int *size);
+extern int xt_compat_match_from_user(struct xt_entry_match *m,
+                                     void **dstptr, int *size);
 extern int xt_compat_match_to_user(struct xt_entry_match *m,
                                    void __user **dstptr, int *size);
 
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 7d24262331a4..4586af397ef4 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1654,16 +1654,6 @@ release_matches:
         return ret;
 }
 
-static inline int
-compat_copy_match_from_user(struct ipt_entry_match *m,
-                            void **dstptr, compat_uint_t *size,
-                            const char *name, const struct ipt_ip *ip,
-                            unsigned int hookmask)
-{
-        xt_compat_match_from_user(m, dstptr, size);
-        return 0;
-}
-
 static int
 compat_copy_entry_from_user(struct ipt_entry *e, void **dstptr,
                             unsigned int *size, const char *name,
@@ -1681,8 +1671,7 @@ compat_copy_entry_from_user(struct ipt_entry *e, void **dstptr,
         memcpy(de, e, sizeof(struct ipt_entry));
 
         *dstptr += sizeof(struct compat_ipt_entry);
-        ret = IPT_MATCH_ITERATE(e, compat_copy_match_from_user, dstptr, size,
-                                name, &de->ip, de->comefrom);
+        ret = IPT_MATCH_ITERATE(e, xt_compat_match_from_user, dstptr, size);
         if (ret)
                 return ret;
         de->target_offset = e->target_offset - (origsize - *size);
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 07bb465d9518..b95284ee4fd4 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -342,8 +342,8 @@ int xt_compat_match_offset(struct xt_match *match)
 }
 EXPORT_SYMBOL_GPL(xt_compat_match_offset);
 
-void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
-                               int *size)
+int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
+                              int *size)
 {
         struct xt_match *match = m->u.kernel.match;
         struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m;
@@ -365,6 +365,7 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
 
         *size += off;
         *dstptr += msize;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(xt_compat_match_from_user);