ip6tables: use match, target and data copy_to_user helpers

Convert ip6tables to copying entries, matches and targets one by one,
using the xt_match_to_user and xt_target_to_user helper functions.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 25a022d41a7035f5350339b17c3cf68517496f85..1e15c54fd5e27dbafaf4d4b0b3de9008a724559f 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -855,10 +855,6 @@ copy_entries_to_user(unsigned int total_size,
                return PTR_ERR(counters);
 
        loc_cpu_entry = private->entries;
-       if (copy_to_user(userptr, loc_cpu_entry, total_size) != 0) {
-               ret = -EFAULT;
-               goto free_counters;
-       }
 
        /* FIXME: use iterator macros --RR */
        /* ... then go back and fix counters and names */
@@ -868,6 +864,10 @@ copy_entries_to_user(unsigned int total_size,
                const struct xt_entry_target *t;
 
                e = (struct ip6t_entry *)(loc_cpu_entry + off);
+               if (copy_to_user(userptr + off, e, sizeof(*e))) {
+                       ret = -EFAULT;
+                       goto free_counters;
+               }
                if (copy_to_user(userptr + off
                                 + offsetof(struct ip6t_entry, counters),
                                 &counters[num],
@@ -881,23 +881,14 @@ copy_entries_to_user(unsigned int total_size,
                     i += m->u.match_size) {
                        m = (void *)e + i;
 
-                       if (copy_to_user(userptr + off + i
-                                        + offsetof(struct xt_entry_match,
-                                                   u.user.name),
-                                        m->u.kernel.match->name,
-                                        strlen(m->u.kernel.match->name)+1)
-                           != 0) {
+                       if (xt_match_to_user(m, userptr + off + i)) {
                                ret = -EFAULT;
                                goto free_counters;
                        }
                }
 
                t = ip6t_get_target_c(e);
-               if (copy_to_user(userptr + off + e->target_offset
-                                + offsetof(struct xt_entry_target,
-                                           u.user.name),
-                                t->u.kernel.target->name,
-                                strlen(t->u.kernel.target->name)+1) != 0) {
+               if (xt_target_to_user(t, userptr + off + e->target_offset)) {
                        ret = -EFAULT;
                        goto free_counters;
                }