]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
netfilter: remove the unused user argument to do_update_counters
authorChristoph Hellwig <hch@lst.de>
Thu, 23 Jul 2020 06:08:52 +0000 (08:08 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jul 2020 22:41:53 +0000 (15:41 -0700)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/netfilter/ebtables.c

index fe13108af1f542516ed6fc794717cd06af9fb3f6..12f8929667bf4345646faa19f9d37de9af3e3685 100644 (file)
@@ -1242,9 +1242,8 @@ void ebt_unregister_table(struct net *net, struct ebt_table *table,
 
 /* userspace just supplied us with counters */
 static int do_update_counters(struct net *net, const char *name,
-                               struct ebt_counter __user *counters,
-                               unsigned int num_counters,
-                               const void __user *user, unsigned int len)
+                             struct ebt_counter __user *counters,
+                             unsigned int num_counters, unsigned int len)
 {
        int i, ret;
        struct ebt_counter *tmp;
@@ -1299,7 +1298,7 @@ static int update_counters(struct net *net, const void __user *user,
                return -EINVAL;
 
        return do_update_counters(net, hlp.name, hlp.counters,
-                               hlp.num_counters, user, len);
+                                 hlp.num_counters, len);
 }
 
 static inline int ebt_obj_to_user(char __user *um, const char *_name,
@@ -2231,7 +2230,7 @@ static int compat_update_counters(struct net *net, void __user *user,
                return update_counters(net, user, len);
 
        return do_update_counters(net, hlp.name, compat_ptr(hlp.counters),
-                                       hlp.num_counters, user, len);
+                                 hlp.num_counters, len);
 }
 
 static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,