Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi David,
The following patchset contains Netfilter fixes for your net tree. This large batch that includes fixes for ipset, netfilter ingress, nf_tables dynamic set instantiation and a longstanding Kconfig dependency problem. More specifically, they are:
1) Add missing check for empty hook list at the ingress hook, from Florian Westphal.
2) Input and output interface are swapped at the ingress hook, reported by Patrick McHardy.
3) Resolve ipset extension alignment issues on ARM, patch from Jozsef Kadlecsik.
4) Fix bit check on bitmap in ipset hash type, also from Jozsef.
5) Release buckets when all entries have expired in ipset hash type, again from Jozsef.
6) Oneliner to initialize conntrack tuple object in the PPTP helper, otherwise the conntrack lookup may fail due to random bits in the structure holes, patch from Anthony Lineham.
7) Silence a bogus gcc warning in nfnetlink_log, from Arnd Bergmann.
8) Fix Kconfig dependency problems with TPROXY, socket and dup, also from Arnd.
9) Add __netdev_alloc_pcpu_stats() to allow creating percpu counters from atomic context, this is required by the follow up fix for nf_tables.
10) Fix crash from the dynamic set expression, we have to add new clone operation that should be defined when a simple memcpy is not enough. This resolves a crash when using per-cpu counters with new Patrick McHardy's flow table nft support.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks!
----------------------------------------------------------------
The following changes since commit 212cd0895330b775f2db49451f046a5ca4e5704b:
selinux: fix random read in selinux_ip_postroute_compat() (2015-11-05 16:45:51 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 086f332167d64b645d37405854f049b9ad7371ab:
netfilter: nf_tables: add clone interface to expression operations (2015-11-10 23:47:32 +0100)
----------------------------------------------------------------
Anthony Lineham (1):
netfilter: Fix removal of GRE expectation entries created by PPTP
Arnd Bergmann (2):
netfilter: nfnetlink_log: work around uninitialized variable warning
netfilter: fix xt_TEE and xt_TPROXY dependencies
Florian Westphal (1):
netfilter: ingress: don't use nf_hook_list_active
Jozsef Kadlecsik (3):
netfilter: ipset: Fix extension alignment
netfilter: ipset: Fix hash:* type expiration
netfilter: ipset: Fix hash type expire: release empty hash bucket block
Pablo Neira Ayuso (4):
netfilter: ingress: fix wrong input interface on hook Merge branch 'master' of git://blackhole.kfki.hu/nf
net: add __netdev_alloc_pcpu_stats() to indicate gfp flags
netfilter: nf_tables: add clone interface to expression operations
include/linux/netdevice.h | 27 +++++++------ include/linux/netfilter/ipset/ip_set.h | 2 +- include/linux/netfilter_ingress.h | 13 ++++--- include/net/netfilter/nf_tables.h | 16 +++++++- net/ipv4/netfilter/nf_nat_pptp.c | 2 +- net/netfilter/Kconfig | 6 +-- net/netfilter/ipset/ip_set_bitmap_gen.h | 17 +++----- net/netfilter/ipset/ip_set_bitmap_ip.c | 14 ++----- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 64 ++++++++++++++----------------- net/netfilter/ipset/ip_set_bitmap_port.c | 18 ++++----- net/netfilter/ipset/ip_set_core.c | 14 ++++--- net/netfilter/ipset/ip_set_hash_gen.h | 26 ++++++++----- net/netfilter/ipset/ip_set_list_set.c | 5 ++- net/netfilter/nfnetlink_log.c | 2 +- net/netfilter/nft_counter.c | 49 +++++++++++++++++++---- net/netfilter/nft_dynset.c | 5 ++- 16 files changed, 161 insertions(+), 119 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/10 netfilter: ingress: don't use nf_hook_list_active
From: Florian Westphal <[email protected]>
nf_hook_list_active() always returns true once at least one device has NF_INGRESS hook enabled.
Thus, don't use this function. Instead, inverse the test and use the static key to elide list_empty test if no NF_INGRESS hooks are active.
--- include/linux/netfilter_ingress.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
include/linux/netfilter_ingress.h +6 -3
@@ -5,10 +5,13 @@#include <linux/netdevice.h> #ifdef CONFIG_NETFILTER_INGRESS -static inline int nf_hook_ingress_active (struct sk_buff *skb) +static inline bool nf_hook_ingress_active (const struct sk_buff *skb) { -return nf_hook_list_active (&skb->dev->nf_hooks_ingress, -NFPROTO_NETDEV ,NF_NETDEV_INGRESS ); +#ifdef HAVE_JUMP_LABEL +if (!static_key_false (&nf_hooks_needed[NFPROTO_NETDEV ][NF_NETDEV_INGRESS ])) +return false; +#endif +return !list_empty (&skb->dev->nf_hooks_ingress); }static inline int nf_hook_ingress (struct sk_buff *skb)
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 2/10 netfilter: ingress: fix wrong input interface on hook
In reply to Pablo Neira AyusoThe input and output interfaces in nf_hook_state_init() are flipped. This fixes iif matching on nftables.
--- include/linux/netfilter_ingress.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/netfilter_ingress.h +2 -2
@@ -19,8 +19,8 @@ static inline int nf_hook_ingress(struct sk_buff *skb)struct nf_hook_state state;nf_hook_state_init (&state, &skb->dev->nf_hooks_ingress, -NF_NETDEV_INGRESS ,INT_MIN ,NFPROTO_NETDEV ,NULL , - skb->dev,NULL ,dev_net (skb->dev),NULL ); +NF_NETDEV_INGRESS ,INT_MIN ,NFPROTO_NETDEV , + skb->dev,NULL ,NULL ,dev_net (skb->dev),NULL );return nf_hook_slow (skb, &state); }
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 3/10 netfilter: ipset: Fix extension alignment
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
The data extensions in ipset lacked the proper memory alignment and thus could lead to kernel crash on several architectures. Therefore the structures have been reorganized and alignment attributes added where needed. The patch was tested on armv7h by Gerhard Wiesinger and on x86_64, sparc64 by Jozsef Kadlecsik.
--- include/linux/netfilter/ipset/ip_set.h | 2 +- net/netfilter/ipset/ip_set_bitmap_gen.h | 17 +++----- net/netfilter/ipset/ip_set_bitmap_ip.c | 14 ++----- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 64 ++++++++++++++----------------- net/netfilter/ipset/ip_set_bitmap_port.c | 18 ++++----- net/netfilter/ipset/ip_set_core.c | 14 ++++--- net/netfilter/ipset/ip_set_hash_gen.h | 11 ++++-- net/netfilter/ipset/ip_set_list_set.c | 5 ++- 8 files changed, 65 insertions(+), 80 deletions(-)
include/linux/netfilter/ipset/ip_set.h +1 -1
@@ -421,7 +421,7 @@ extern void ip_set_free(void *members);extern int ip_set_get_ipaddr4 (struct nlattr *nla,__be32 *ipaddr);extern int ip_set_get_ipaddr6 (struct nlattr *nla,union nf_inet_addr *ipaddr);extern size_t ip_set_elem_len (struct ip_set *set,struct nlattr *tb[], -size_t len); +size_t len,size_t align);extern int ip_set_get_extensions (struct ip_set *set,struct nlattr *tb[],struct ip_set_ext *ext);
net/netfilter/ipset/ip_set_bitmap_gen.h +6 -11
@@ -33,7 +33,7 @@#define mtype_gc IPSET_TOKEN(MTYPE, _gc)#define mtype MTYPE -#define get_ext (set, map, id) ((map)->extensions + (set)->dsize * (id)) +#define get_ext (set, map, id) ((map)->extensions + ((set)->dsize * (id)))static void mtype_gc_init (struct ip_set *set,void (*gc)(unsigned long ul_set))
@@ -67,12 +67,9 @@ mtype_destroy(struct ip_set *set)del_timer_sync (&map->gc);ip_set_free (map->members); -if (set->dsize) { -if (set->extensions &IPSET_EXT_DESTROY ) -mtype_ext_cleanup (set); -ip_set_free (map->extensions); - } -kfree (map); +if (set->dsize && set->extensions &IPSET_EXT_DESTROY ) +mtype_ext_cleanup (set); +ip_set_free (map); set->data =NULL ; }
@@ -92,16 +89,14 @@ mtype_head(struct ip_set *set, struct sk_buff *skb) {const struct mtype *map = set->data;struct nlattr *nested; +size_t memsize =sizeof (*map) + map->memsize; nested =ipset_nest_start (skb,IPSET_ATTR_DATA );if (!nested) goto nla_put_failure;if (mtype_do_head (skb, map) ||nla_put_net32 (skb,IPSET_ATTR_REFERENCES ,htonl (set->ref -1 )) || -nla_put_net32 (skb,IPSET_ATTR_MEMSIZE , -htonl (sizeof (*map) + - map->memsize + - set->dsize * map->elements))) +nla_put_net32 (skb,IPSET_ATTR_MEMSIZE ,htonl (memsize))) goto nla_put_failure;if (unlikely (ip_set_put_flags (skb, set))) goto nla_put_failure;
net/netfilter/ipset/ip_set_bitmap_ip.c +4 -10
@@ -41,7 +41,6 @@ MODULE_ALIAS("ip_set_bitmap:ip");/* Type structure */ struct bitmap_ip {void *members;/* the set members */ -void *extensions;/* data extensions */ u32 first_ip;/* host byte order, included in range */ u32 last_ip;/* host byte order, included in range */ u32 elements;/* number of max elements in the set */
@@ -49,6 +48,8 @@ struct bitmap_ip {size_t memsize;/* members size */ u8 netmask;/* subnet netmask */ struct timer_list gc;/* garbage collection */ +unsigned char extensions[0 ]/* data extensions */ +__aligned(__alignof__(u64)) ; };/* ADT structure for generic function args */
@@ -224,13 +225,6 @@ init_map_ip(struct ip_set *set, struct bitmap_ip *map, map->members =ip_set_alloc (map->memsize);if (!map->members)return false; -if (set->dsize) { - map->extensions =ip_set_alloc (set->dsize * elements); -if (!map->extensions) { -kfree (map->members); -return false; - } - } map->first_ip = first_ip; map->last_ip = last_ip; map->elements = elements;
@@ -316,13 +310,13 @@ bitmap_ip_create(struct net *net, struct ip_set *set, struct nlattr *tb[],pr_debug ("hosts %u, elements %llu\n" , hosts, (unsigned long long )elements); - map =kzalloc (sizeof (*map),GFP_KERNEL ); + set->dsize =ip_set_elem_len (set, tb,0 ,0 ); + map =ip_set_alloc (sizeof (*map) + elements * set->dsize);if (!map)return -ENOMEM ; map->memsize =bitmap_bytes (0 , elements -1 ); set->variant = &bitmap_ip; - set->dsize =ip_set_elem_len (set, tb,0 );if (!init_map_ip (set, map, first_ip, last_ip, elements, hosts, netmask)) {kfree (map);
net/netfilter/ipset/ip_set_bitmap_ipmac.c +29 -35
168 lines not on this page · raw message
net/netfilter/ipset/ip_set_bitmap_port.c +7 -11
@@ -35,12 +35,13 @@ MODULE_ALIAS("ip_set_bitmap:port");/* Type structure */ struct bitmap_port {void *members;/* the set members */ -void *extensions;/* data extensions */ u16 first_port;/* host byte order, included in range */ u16 last_port;/* host byte order, included in range */ u32 elements;/* number of max elements in the set */ size_t memsize;/* members size */ struct timer_list gc;/* garbage collection */ +unsigned char extensions[0 ]/* data extensions */ +__aligned(__alignof__(u64)) ; };/* ADT structure for generic function args */
@@ -209,13 +210,6 @@ init_map_port(struct ip_set *set, struct bitmap_port *map, map->members =ip_set_alloc (map->memsize);if (!map->members)return false; -if (set->dsize) { - map->extensions =ip_set_alloc (set->dsize * map->elements); -if (!map->extensions) { -kfree (map->members); -return false; - } - } map->first_port = first_port; map->last_port = last_port; set->timeout =IPSET_NO_TIMEOUT ;
@@ -232,6 +226,7 @@ bitmap_port_create(struct net *net, struct ip_set *set, struct nlattr *tb[], {struct bitmap_port *map;u16 first_port, last_port; +u32 elements; if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_PORT) || !ip_set_attr_netorder(tb, IPSET_ATTR_PORT_TO) ||
@@ -248,14 +243,15 @@ bitmap_port_create(struct net *net, struct ip_set *set, struct nlattr *tb[], last_port = tmp; } - map =kzalloc (sizeof (*map),GFP_KERNEL ); + elements = last_port - first_port +1 ; + set->dsize =ip_set_elem_len (set, tb,0 ,0 ); + map =ip_set_alloc (sizeof (*map) + elements * set->dsize);if (!map)return -ENOMEM ; - map->elements = last_port - first_port +1 ; + map->elements = elements; map->memsize =bitmap_bytes (0 , map->elements); set->variant = &bitmap_port; - set->dsize =ip_set_elem_len (set, tb,0 );if (!init_map_port (set, map, first_port, last_port)) {kfree (map);return -ENOMEM ;
net/netfilter/ipset/ip_set_core.c +8 -6
@@ -364,25 +364,27 @@ add_extension(enum ip_set_ext_id id, u32 flags, struct nlattr *tb[]) }size_t -ip_set_elem_len (struct ip_set *set,struct nlattr *tb[],size_t len) +ip_set_elem_len (struct ip_set *set,struct nlattr *tb[],size_t len, +size_t align) {enum ip_set_ext_id id; -size_t offset = len;u32 cadt_flags =0 ;if (tb[IPSET_ATTR_CADT_FLAGS ]) cadt_flags =ip_set_get_h32 (tb[IPSET_ATTR_CADT_FLAGS ]);if (cadt_flags &IPSET_FLAG_WITH_FORCEADD ) set->flags |=IPSET_CREATE_FLAG_FORCEADD ; +if (!align) + align =1 ;for (id =0 ; id <IPSET_EXT_ID_MAX ; id++) {if (!add_extension (id, cadt_flags, tb))continue ; - offset =ALIGN (offset, ip_set_extensions[id].align); - set->offset[id] = offset; + len =ALIGN (len, ip_set_extensions[id].align); + set->offset[id] = len; set->extensions |= ip_set_extensions[id].type; - offset += ip_set_extensions[id].len; + len += ip_set_extensions[id].len; } -return offset; +return ALIGN (len, align); }EXPORT_SYMBOL_GPL (ip_set_elem_len);
net/netfilter/ipset/ip_set_hash_gen.h +7 -4
@@ -72,8 +72,9 @@ struct hbucket {DECLARE_BITMAP (used,AHASH_MAX_TUNED );u8 size;/* size of the array */ u8 pos;/* position of the first free entry */ -unsigned char value[0 ];/* the array of the values */ -} __attribute__ ((aligned)); +unsigned char value[0 ]/* the array of the values */ +__aligned(__alignof__(u64)) ; +};/* The hash table: the table size stored here in order to make resizing easy */ struct htable {
@@ -1323,12 +1324,14 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set,#endif set->variant = &IPSET_TOKEN(HTYPE, 4_variant); set->dsize =ip_set_elem_len (set, tb, - sizeof(struct IPSET_TOKEN(HTYPE, 4_elem))); + sizeof(struct IPSET_TOKEN(HTYPE, 4_elem)), + __alignof__(struct IPSET_TOKEN(HTYPE, 4_elem))); #ifndef IP_SET_PROTO_UNDEF }else { set->variant = &IPSET_TOKEN(HTYPE, 6_variant); set->dsize =ip_set_elem_len (set, tb, - sizeof(struct IPSET_TOKEN(HTYPE, 6_elem))); + sizeof(struct IPSET_TOKEN(HTYPE, 6_elem)), + __alignof__(struct IPSET_TOKEN(HTYPE, 6_elem))); }#endif if (tb[IPSET_ATTR_TIMEOUT ]) {
net/netfilter/ipset/ip_set_list_set.c +3 -2
@@ -31,7 +31,7 @@ struct set_elem {struct rcu_head rcu;struct list_head list;ip_set_id_t id; -}; +}__aligned(__alignof__(u64)) ;struct set_adt_elem {ip_set_id_t id;
@@ -618,7 +618,8 @@ list_set_create(struct net *net, struct ip_set *set, struct nlattr *tb[], size =IP_SET_LIST_MIN_SIZE ; set->variant = &set_variant; - set->dsize =ip_set_elem_len (set, tb,sizeof (struct set_elem )); + set->dsize =ip_set_elem_len (set, tb,sizeof (struct set_elem ), + __alignof__(struct set_elem ));if (!init_list_set (net, set, size))return -ENOMEM ;if (tb[IPSET_ATTR_TIMEOUT ]) {
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 4/10 netfilter: ipset: Fix hash:* type expiration
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
Incorrect index was used when the data blob was shrinked at expiration, which could lead to falsely expired entries and memory leak when the comment extension was used too.
--- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_hash_gen.h +1 -1
@@ -523,7 +523,7 @@ mtype_expire(struct ip_set *set, struct htype *h, u8 nets_length, size_t dsize)continue ; data =ahash_data (n, j, dsize);memcpy (tmp->value + d * dsize, data, dsize); -set_bit (j, tmp->used); +set_bit (d, tmp->used); d++; } tmp->pos = d;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 5/10 netfilter: ipset: Fix hash type expire: release empty hash bucket block
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
When all entries are expired/all slots are empty, release the bucket.
--- net/netfilter/ipset/ip_set_hash_gen.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_hash_gen.h +9 -4
@@ -476,7 +476,7 @@ static void mtype_expire(struct ip_set *set, struct htype *h, u8 nets_length, size_t dsize) { struct htable *t; -struct hbucket *n; +struct hbucket *n, *tmp;struct mtype_elem *data;u32 i, j, d;#ifdef IP_SET_HASH_WITH_NETS
@@ -511,9 +511,14 @@ mtype_expire(struct ip_set *set, struct htype *h, u8 nets_length, size_t dsize) } }if (d >=AHASH_INIT_SIZE ) { -struct hbucket *tmp =kzalloc (sizeof (*tmp) + - (n->size -AHASH_INIT_SIZE ) * dsize, -GFP_ATOMIC ); +if (d >= n->size) { +rcu_assign_pointer (hbucket (t, i),NULL ); +kfree_rcu (n, rcu); +continue ; + } + tmp =kzalloc (sizeof (*tmp) + + (n->size -AHASH_INIT_SIZE ) * dsize, +GFP_ATOMIC );if (!tmp)/* Still try to delete expired elements */ continue ;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 6/10 netfilter: Fix removal of GRE expectation entries created by PPTP
In reply to Pablo Neira AyusoFrom: Anthony Lineham <[email protected]>
The uninitialized tuple structure caused incorrect hash calculation and the lookup failed.
--- net/ipv4/netfilter/nf_nat_pptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/netfilter/nf_nat_pptp.c +1 -1
@@ -45,7 +45,7 @@ static void pptp_nat_expected(struct nf_conn *ct,struct net *net =nf_ct_net (ct);const struct nf_conn *master = ct->master;struct nf_conntrack_expect *other_exp; -struct nf_conntrack_tuple t; +struct nf_conntrack_tuple t = {};const struct nf_ct_pptp_master *ct_pptp_info;const struct nf_nat_pptp *nat_pptp_info;struct nf_nat_range range;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 7/10 netfilter: nfnetlink_log: work around uninitialized variable warning
In reply to Pablo Neira AyusoFrom: Arnd Bergmann <[email protected]>
After a recent (correct) change, gcc started warning about the use of the 'flags' variable in nfulnl_recv_config()
net/netfilter/nfnetlink_log.c: In function 'nfulnl_recv_config':net/netfilter/nfnetlink_log.c:320:14: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized] net/netfilter/nfnetlink_log.c:828:6: note: 'flags' was declared here
The warning first shows up in ARM s3c2410_defconfig with gcc-4.3 or higher (including 5.2.1, which is the latest version I checked) I tried working around it by rearranging the code but had no success with that.
As a last resort, this initializes the variable to zero, which shuts up the warning, but means that we don't get a warning if the code is ever changed in a way that actually causes the variable to be used without first being written.
--- net/netfilter/nfnetlink_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nfnetlink_log.c +1 -1
@@ -825,7 +825,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,struct net *net =sock_net (ctnl);struct nfnl_log_net *log =nfnl_log_pernet (net);int ret =0 ; -u16 flags; +u16 flags =0 ;if (nfula[NFULA_CFG_CMD ]) {u_int8_t pf = nfmsg->nfgen_family;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 8/10 netfilter: fix xt_TEE and xt_TPROXY dependencies
In reply to Pablo Neira AyusoFrom: Arnd Bergmann <[email protected]>
Kconfig is too smart for its own good: a Kconfig line that states
select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
means that if IP6_NF_IPTABLES is set to 'm', then NF_DEFRAG_IPV6 will also be set to 'm', regardless of the state of the symbol from which it is selected. When the xt_TEE driver is built-in and nothing else forces NF_DEFRAG_IPV6 to be built-in, this causes a link-time error:
net/built-in.o: In function `tee_tg6':net/netfilter/xt_TEE.c:46: undefined reference to `nf_dup_ipv6'
This works around that behavior by changing the dependency to 'if IP6_NF_IPTABLES != n', which is interpreted as boolean expression rather than a tristate and causes the NF_DEFRAG_IPV6 symbol to be built-in as well.
The bug only occurs once in thousands of 'randconfig' builds and does not really impact real users. From inspecting the other surrounding Kconfig symbols, I am guessing that NETFILTER_XT_TARGET_TPROXY and NETFILTER_XT_MATCH_SOCKET have the same issue. If not, this change should still be harmless.
--- net/netfilter/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/Kconfig +3 -3
@@ -869,7 +869,7 @@ config NETFILTER_XT_TARGET_TEE depends on IPV6 || IPV6=n depends on !NF_CONNTRACK || NF_CONNTRACK select NF_DUP_IPV4 - select NF_DUP_IPV6 if IP6_NF_IPTABLES + select NF_DUP_IPV6 if IP6_NF_IPTABLES != n ---help--- This option adds a "TEE" target with which a packet can be cloned and this clone be rerouted to another nexthop.
@@ -882,7 +882,7 @@ config NETFILTER_XT_TARGET_TPROXY depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n depends on IP_NF_MANGLE select NF_DEFRAG_IPV4 - select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES + select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES != n help This option adds a `TPROXY' target, which is somewhat similar to REDIRECT. It can only be used in the mangle table and is useful
@@ -1375,7 +1375,7 @@ config NETFILTER_XT_MATCH_SOCKET depends on IPV6 || IPV6=n depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n select NF_DEFRAG_IPV4 - select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES + select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES != n help This option adds a `socket' match, which can be used to match packets for which a TCP or UDP socket lookup finds a valid socket.
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 9/10 net: add __netdev_alloc_pcpu_stats() to indicate gfp flags
In reply to Pablo Neira Ayusonf_tables may create percpu counters from the packet path through its dynamic set instantiation infrastructure, so we need a way to allocate this through GFP_ATOMIC.
--- include/linux/netdevice.h | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
include/linux/netdevice.h +15 -12
@@ -2068,20 +2068,23 @@ struct pcpu_sw_netstats {struct u64_stats_sync syncp; }; -#define netdev_alloc_pcpu_stats (type) \ -({ \ - typeof(type) __percpu *pcpu_stats = alloc_percpu(type); \ - if (pcpu_stats) { \ - int __cpu; \ - for_each_possible_cpu(__cpu) { \ - typeof(type) *stat; \ - stat = per_cpu_ptr(pcpu_stats, __cpu); \ - u64_stats_init(&stat->syncp); \ - } \ - } \ - pcpu_stats; \ +#define __netdev_alloc_pcpu_stats (type, gfp) \ +({ \ + typeof(type) __percpu *pcpu_stats = alloc_percpu_gfp(type, gfp);\ + if (pcpu_stats) { \ + int __cpu; \ + for_each_possible_cpu(__cpu) { \ + typeof(type) *stat; \ + stat = per_cpu_ptr(pcpu_stats, __cpu); \ + u64_stats_init(&stat->syncp); \ + } \ + } \ + pcpu_stats; \ }) +#define netdev_alloc_pcpu_stats (type) \ + __netdev_alloc_pcpu_stats(type, GFP_KERNEL); +#include <linux/notifier.h> /* netdevice notifier chain. Please remember to update the rtnetlink
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 10/10 netfilter: nf_tables: add clone interface to expression operations
In reply to Pablo Neira AyusoWith the conversion of the counter expressions to make it percpu, we need to clone the percpu memory area, otherwise we crash when using counters from flow tables.
--- include/net/netfilter/nf_tables.h | 16 +++++++++++-- net/netfilter/nft_counter.c | 49 ++++++++++++++++++++++++++++++++------- net/netfilter/nft_dynset.c | 5 ++-- 3 files changed, 58 insertions(+), 12 deletions(-)
include/net/netfilter/nf_tables.h +14 -2
@@ -618,6 +618,8 @@ struct nft_expr_ops {void (*eval)(const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt); +int (*clone)(struct nft_expr *dst, +const struct nft_expr *src);unsigned int size; int (*init)(const struct nft_ctx *ctx,
@@ -660,10 +662,20 @@ void nft_expr_destroy(const struct nft_ctx *ctx, struct nft_expr *expr);int nft_expr_dump (struct sk_buff *skb,unsigned int attr,const struct nft_expr *expr); -static inline void nft_expr_clone (struct nft_expr *dst,struct nft_expr *src) +static inline int nft_expr_clone (struct nft_expr *dst,struct nft_expr *src) { +int err; +__module_get (src->ops->type->owner); -memcpy (dst, src, src->ops->size); +if (src->ops->clone) { + dst->ops = src->ops; + err = src->ops->clone (dst, src); +if (err <0 ) +return err; + }else { +memcpy (dst, src, src->ops->size); + } +return 0 ; }/**
net/netfilter/nft_counter.c +41 -8
80 lines not on this page · raw message
net/netfilter/nft_dynset.c +3 -2
@@ -50,8 +50,9 @@ static void *nft_dynset_new(struct nft_set *set, const struct nft_expr *expr, } ext =nft_set_elem_ext (set, elem); -if (priv->expr !=NULL ) -nft_expr_clone (nft_set_ext_expr (ext), priv->expr); +if (priv->expr !=NULL && +nft_expr_clone (nft_set_ext_expr (ext), priv->expr) <0 ) +return NULL ;return elem; }
Signature · 1 line
2.1.4
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Wed, 11 Nov 2015 18:33:33 +0100
Quoted 4 lines
The following patchset contains Netfilter fixes for your net tree. This large batch that includes fixes for ipset, netfilter ingress,
nf_tablesdynamic set instantiation and a longstandingKconfigdependency problem. More specifically, they are:
...
Quoted 3 lines
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks a lot Pablo.
Quoted 4 lines · Pablo Neira Ayuso
Jozsef Kadlecsik (3):
netfilter: ipset: Fix extension alignment
netfilter: ipset: Fix hash:* type expiration
netfilter: ipset: Fix hash type expire: release empty hash bucket block
Should these three go to stable? We've had reports in Fedora about ipset crashing on e.g. ARM architectures with 4.2.y kernels. If not all three, then perhaps just the alignment fix?
josh
Quoted 9 lines · Josh Boyer
Quoted 4 lines · Pablo Neira Ayuso
Jozsef Kadlecsik (3):
netfilter: ipset: Fix extension alignment
netfilter: ipset: Fix hash:* type expiration
netfilter: ipset: Fix hash type expire: release empty hash bucket blockShould these three go to stable? We've had reports in Fedora about ipset crashing on e.g. ARM architectures with 4.2.y kernels. If not all three, then perhaps just the alignment fix?
Yes, those should definitely go to stable, at least the first two ones.
Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary