netfilter: remove the unused user argument to do_update_counters (7e4b9dba) · Commits · 戴 / test

net/bridge/netfilter/ebtables.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1243,8 +1243,7 @@ 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)
		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,