Skip to contentSkip to conversation

Patch "netfilter: x_tables: introduce and use xt_copy_counters_from_user" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jun 23, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

netfilter: x_tables: introduce and use xt_copy_counters_from_user

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
netfilter-x_tables-introduce-and-use-xt_copy_counters_from_user.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From d7591f0c41ce3e67600a982bab6989ef0f07b3ce Mon Sep 17 00:00:00 2001

From: Florian Westphal <[email protected]>
Date: Fri, 1 Apr 2016 15:37:59 +0200
Subject: netfilter: x_tables: introduce and use xt_copy_counters_from_user

From: Florian Westphal <[email protected]>

commit d7591f0c41ce3e67600a982bab6989ef0f07b3ce upstream.

The three variants use same copy&pasted code, condense this into a helper and use that.

Make sure info.name is 0-terminated.

---
 include/linux/netfilter/x_tables.h |    3 +
 net/ipv4/netfilter/arp_tables.c    |   48 ++----------------------
 net/ipv4/netfilter/ip_tables.c     |   48 ++----------------------
 net/ipv6/netfilter/ip6_tables.c    |   49 ++----------------------
 net/netfilter/x_tables.c           |   74 +++++++++++++++++++++++++++++++++++++
 5 files changed, 92 insertions(+), 130 deletions(-)
include/linux/netfilter/x_tables.h +3 -0
@@ -251,6 +251,9 @@ int xt_check_match(struct xt_mtchk_param
 int xt_check_target(struct xt_tgchk_param *, unsigned int size, u_int8_t proto,
 		    bool inv_proto);
 
+void *xt_copy_counters_from_user(const void __user *user, unsigned int len,
+				 struct xt_counters_info *info, bool compat);
+
 struct xt_table *xt_register_table(struct net *net,
 				   const struct xt_table *table,
 				   struct xt_table_info *bootstrap,
net/ipv4/netfilter/arp_tables.c +5 -43

67 lines not on this page · raw message

net/ipv4/netfilter/ip_tables.c +5 -43

67 lines not on this page · raw message

net/ipv6/netfilter/ip6_tables.c +5 -44

67 lines not on this page · raw message

net/netfilter/x_tables.c +74 -0

80 lines not on this page · raw message

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/netfilter-x_tables-validate-targets-of-jumps.patch queue-4.6/netfilter-x_tables-introduce-and-use-xt_copy_counters_from_user.patch queue-4.6/netfilter-arp_tables-simplify-translate_compat_table-args.patch queue-4.6/netfilter-x_tables-assert-minimum-target-size.patch queue-4.6/netfilter-ip6_tables-simplify-translate_compat_table-args.patch queue-4.6/netfilter-x_tables-check-for-bogus-target-offset.patch queue-4.6/netfilter-x_tables-add-compat-version-of-xt_check_entry_offsets.patch queue-4.6/netfilter-x_tables-don-t-reject-valid-target-size-on-some-architectures.patch queue-4.6/netfilter-x_tables-check-standard-target-size-too.patch queue-4.6/netfilter-x_tables-xt_compat_match_from_user-doesn-t-need-a-retval.patch queue-4.6/netfilter-x_tables-do-compat-validation-via-translate_table.patch queue-4.6/netfilter-x_tables-add-and-use-xt_check_entry_offsets.patch queue-4.6/netfilter-x_tables-don-t-move-to-non-existent-next-rule.patch queue-4.6/netfilter-x_tables-kill-check_entry-helper.patch queue-4.6/netfilter-x_tables-validate-all-offsets-and-sizes-in-a-rule.patch queue-4.6/netfilter-ip_tables-simplify-translate_compat_table-args.patch