rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / net / bridge / netfilter / ebtables.c

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 6651a7797d46aca846d833086990c953bfdbfa63..3d110c4fc7870dda1d6efcb00f9169f819dc6526 100644 (file)
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1044,9 +1044,10 @@ 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))) {
-               /* Silent error, can't fail, new table is already in place */
-               net_warn_ratelimited("ebtables: counters copy to user failed while replacing table\n");
+               ret = -EFAULT;
        }
+       else
+               ret = 0;
 
        /* decrease module count and free resources */
        EBT_ENTRY_ITERATE(table->entries, table->entries_size,