netfilter: ebtables: use array_size() helper in copy_{from,to}_user()

[linux-2.6-microblaze.git] / net / bridge / netfilter / ebtables.c

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 4a1508a..0ec2e11 100644 (file)
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1071,7 +1071,7 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,
         */
        if (repl->num_counters &&
           copy_to_user(repl->counters, counterstmp,
-          repl->num_counters * sizeof(struct ebt_counter))) {
+          array_size(repl->num_counters, sizeof(struct ebt_counter)))) {
                /* Silent error, can't fail, new table is already in place */
                net_warn_ratelimited("ebtables: counters copy to user failed while replacing table\n");
        }
@@ -1399,7 +1399,8 @@ static int do_update_counters(struct net *net, const char *name,
                goto unlock_mutex;
        }
 
-       if (copy_from_user(tmp, counters, num_counters * sizeof(*counters))) {
+       if (copy_from_user(tmp, counters,
+                          array_size(num_counters, sizeof(*counters)))) {
                ret = -EFAULT;
                goto unlock_mutex;
        }
@@ -1532,7 +1533,7 @@ static int copy_counters_to_user(struct ebt_table *t,
        write_unlock_bh(&t->lock);
 
        if (copy_to_user(user, counterstmp,
-          nentries * sizeof(struct ebt_counter)))
+           array_size(nentries, sizeof(struct ebt_counter))))
                ret = -EFAULT;
        vfree(counterstmp);
        return ret;