netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover netfilter fixes for net
Hi David,
The following patchset contains Netfilter fixes for you net tree, they are:
* Fix ICMPv6 NAT due to wrong comparison, code instead of type, from Phil Oester.
* Fix RCU race in conntrack extensions release path, from Michal Kubecek.
* Fix missing inversion in the userspace ipset test command match if the nomatch option is specified, from Jozsef Kadlecsik.
* Skip layer 4 protocol matching in ipset in case of IPv6 fragments, also from Jozsef Kadlecsik.
* Fix sequence adjustment in nfnetlink_queue due to using the netlink skb instead of the network skb, from Gao feng.
* Make sure we cannot swap of sets with different layer 3 family in ipset, from Jozsef Kadlecsik.
* Fix possible bogus matching in ipset if hash sets with net elements are used, from Oliver Smith.
Gao feng (1):
netfilter: nfnetlink_queue: use network skb for sequence adjustment
Jozsef Kadlecsik (3):
netfilter: ipset: Skip really non-first fragments for IPv6 when getting port/protocol
netfilter: ipset: Consistent userspace testing with nomatch flag
netfilter: ipset: Validate the set family and not the set type family at swapping
Michal Kubeček (1):
netfilter: nf_conntrack: use RCU safe kfree for conntrack extensions
Oliver Smith (1):
netfilter: ipset: Fix serious failure in CIDR tracking
Phil Oester (1):
netfilter: nf_nat_proto_icmpv6:: fix wrong comparison in icmpv6_manip_pkt
include/linux/netfilter/ipset/ip_set.h | 6 ++++-- include/net/netfilter/nf_conntrack_extend.h | 2 +- net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 4 ++-- net/netfilter/ipset/ip_set_core.c | 5 ++--- net/netfilter/ipset/ip_set_getport.c | 4 ++-- net/netfilter/ipset/ip_set_hash_gen.h | 28 +++++++++++++++------------ net/netfilter/ipset/ip_set_hash_ipportnet.c | 4 ++-- net/netfilter/ipset/ip_set_hash_net.c | 4 ++-- net/netfilter/ipset/ip_set_hash_netiface.c | 4 ++-- net/netfilter/ipset/ip_set_hash_netport.c | 4 ++-- net/netfilter/nfnetlink_queue_core.c | 2 +- 11 files changed, 36 insertions(+), 31 deletions(-)
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/7 netfilter: nf_conntrack: use RCU safe kfree for conntrack extensions
From: Michal Kubeček <[email protected]>
Commit 68b80f11 (netfilter: nf_nat: fix RCU races) introduced RCU protection for freeing extension data when reallocation moves them to a new location. We need the same protection when freeing them in nf_ct_ext_free() in order to prevent a use-after-free by other threads referencing a NAT extension data via bysource list.
--- include/net/netfilter/nf_conntrack_extend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/netfilter/nf_conntrack_extend.h +1 -1
@@ -86,7 +86,7 @@ static inline void nf_ct_ext_destroy(struct nf_conn *ct)static inline void nf_ct_ext_free (struct nf_conn *ct) {if (ct->ext) -kfree (ct->ext); +kfree_rcu (ct->ext, rcu); }/* Add this type, returns pointer to data or NULL. */
Signature · 6 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso
maintainerPATCH 2/7 netfilter: nf_nat_proto_icmpv6:: fix wrong comparison in icmpv6_manip_pkt
In reply to Pablo Neira AyusoFrom: Phil Oester <[email protected]>
In commit 58a317f1 (netfilter: ipv6: add IPv6 NAT support), icmpv6_manip_pkt was added with an incorrect comparison of ICMP codes to types. This causes problems when using NAT rules with the --random option. Correct the comparison.
This closes netfilter bugzilla #851, reported by Alexander Neumann.
--- net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/netfilter/nf_nat_proto_icmpv6.c +2 -2
@@ -69,8 +69,8 @@ icmpv6_manip_pkt(struct sk_buff *skb, hdr = (struct icmp6hdr *)(skb->data + hdroff); l3proto->csum_update (skb, iphdroff, &hdr->icmp6_cksum, tuple, maniptype); -if (hdr->icmp6_code ==ICMPV6_ECHO_REQUEST || - hdr->icmp6_code ==ICMPV6_ECHO_REPLY ) { +if (hdr->icmp6_type ==ICMPV6_ECHO_REQUEST || + hdr->icmp6_type ==ICMPV6_ECHO_REPLY ) {inet_proto_csum_replace2 (&hdr->icmp6_cksum, skb, hdr->icmp6_identifier, tuple->src.u.icmp.id,0 );
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 3/7 netfilter: ipset: Skip really non-first fragments for IPv6 when getting port/protocol
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
--- net/netfilter/ipset/ip_set_getport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipset/ip_set_getport.c +2 -2
@@ -116,12 +116,12 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src, {int protoff;u8 nexthdr; -__be16 frag_off; +__be16 frag_off =0 ; nexthdr =ipv6_hdr (skb)->nexthdr; protoff =ipv6_skip_exthdr (skb,sizeof (struct ipv6hdr ), &nexthdr, &frag_off); -if (protoff <0 ) +if (protoff <0 || (frag_off &htons (~0x7 )) !=0 )return false;return get_port (skb, nexthdr, protoff, src, port, proto);
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 4/7 netfilter: ipset: Consistent userspace testing with nomatch flag
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
The "nomatch" commandline flag should invert the matching at testing, similarly to the --return-nomatch flag of the "set" match of iptables. Until now it worked with the elements with "nomatch" flag only. From now on it works with elements without the flag too, i.e:
# ipset n test hash:net # ipset a test 10.0.0.0/24 nomatch # ipset t test 10.0.0.1 10.0.0.1 is NOT in set test. # ipset t test 10.0.0.1 nomatch 10.0.0.1 is in set test.
# ipset a test 192.168.0.0/24 # ipset t test 192.168.0.1 192.168.0.1 is in set test. # ipset t test 192.168.0.1 nomatch 192.168.0.1 is NOT in set test.
Before the patch the results were
...
# ipset t test 192.168.0.1 192.168.0.1 is in set test. # ipset t test 192.168.0.1 nomatch 192.168.0.1 is in set test.
--- include/linux/netfilter/ipset/ip_set.h | 6 ++++-- net/netfilter/ipset/ip_set_core.c | 3 +-- net/netfilter/ipset/ip_set_hash_ipportnet.c | 4 ++-- net/netfilter/ipset/ip_set_hash_net.c | 4 ++-- net/netfilter/ipset/ip_set_hash_netiface.c | 4 ++-- net/netfilter/ipset/ip_set_hash_netport.c | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-)
include/linux/netfilter/ipset/ip_set.h +4 -2
@@ -296,10 +296,12 @@ ip_set_eexist(int ret, u32 flags)/* Match elements marked with nomatch */ static inline bool -ip_set_enomatch (int ret,u32 flags,enum ipset_adt adt) +ip_set_enomatch (int ret,u32 flags,enum ipset_adt adt,struct ip_set *set) {return adt ==IPSET_TEST && - ret == -ENOTEMPTY && ((flags >>16 ) &IPSET_FLAG_NOMATCH ); + (set->type->features &IPSET_TYPE_NOMATCH ) && + ((flags >>16 ) &IPSET_FLAG_NOMATCH ) && + (ret >0 || ret == -ENOTEMPTY ); }/* Check the NLA_F_NET_BYTEORDER flag */
net/netfilter/ipset/ip_set_core.c +1 -2
@@ -1489,8 +1489,7 @@ ip_set_utest(struct sock *ctnl, struct sk_buff *skb,if (ret == -EAGAIN ) ret =1 ; -return (ret <0 && ret != -ENOTEMPTY ) ? ret : - ret >0 ?0 : -IPSET_ERR_EXIST ; +return ret >0 ?0 : -IPSET_ERR_EXIST ; }/* Get headed data of a set */
net/netfilter/ipset/ip_set_hash_ipportnet.c +2 -2
@@ -260,7 +260,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[], e.ip =htonl (ip); e.ip2 =htonl (ip2_from &ip_set_hostmask (e.cidr +1 )); ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret :ip_set_eexist (ret, flags) ?0 : ret; }
@@ -544,7 +544,7 @@ hash_ipportnet6_uadt(struct ip_set *set, struct nlattr *tb[],if (adt ==IPSET_TEST || !with_ports || !tb[IPSET_ATTR_PORT_TO ]) { ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret :ip_set_eexist (ret, flags) ?0 : ret; }
net/netfilter/ipset/ip_set_hash_net.c +2 -2
@@ -199,7 +199,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[],if (adt ==IPSET_TEST || !tb[IPSET_ATTR_IP_TO ]) { e.ip =htonl (ip &ip_set_hostmask (e.cidr)); ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret:ip_set_eexist (ret, flags) ?0 : ret; }
@@ -396,7 +396,7 @@ hash_net6_uadt(struct ip_set *set, struct nlattr *tb[], ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret :ip_set_eexist (ret, flags) ?0 : ret; }
net/netfilter/ipset/ip_set_hash_netiface.c +2 -2
@@ -368,7 +368,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],if (adt ==IPSET_TEST || !tb[IPSET_ATTR_IP_TO ]) { e.ip =htonl (ip &ip_set_hostmask (e.cidr)); ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret :ip_set_eexist (ret, flags) ?0 : ret; }
@@ -634,7 +634,7 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[], ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret :ip_set_eexist (ret, flags) ?0 : ret; }
net/netfilter/ipset/ip_set_hash_netport.c +2 -2
@@ -244,7 +244,7 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[],if (adt ==IPSET_TEST || !(with_ports || tb[IPSET_ATTR_IP_TO ])) { e.ip =htonl (ip &ip_set_hostmask (e.cidr +1 )); ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret :ip_set_eexist (ret, flags) ?0 : ret; }
@@ -489,7 +489,7 @@ hash_netport6_uadt(struct ip_set *set, struct nlattr *tb[],if (adt ==IPSET_TEST || !with_ports || !tb[IPSET_ATTR_PORT_TO ]) { ret =adtfn (set, &e, &ext, &ext, flags); -return ip_set_enomatch (ret, flags, adt) ?1 : +return ip_set_enomatch (ret, flags, adt, set) ? -ret :ip_set_eexist (ret, flags) ?0 : ret; }
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 5/7 netfilter: ipset: Validate the set family and not the set type family at swapping
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
This closes netfilter bugzilla #843, reported by Quentin Armitage.
--- net/netfilter/ipset/ip_set_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_core.c +1 -1
@@ -1052,7 +1052,7 @@ ip_set_swap(struct sock *ctnl, struct sk_buff *skb,* Not an artificial restriction anymore, as we must prevent * possible loops created by swapping in setlist type of sets. */ if (!(from->type->features == to->type->features && - from->type->family == to->type->family)) + from->family == to->family))return -IPSET_ERR_TYPE_MISMATCH ;strncpy (from_name, from->name,IPSET_MAXNAMELEN );
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 6/7 netfilter: ipset: Fix serious failure in CIDR tracking
In reply to Pablo Neira AyusoFrom: Oliver Smith <[email protected]>
This fixes a serious bug affecting all hash types with a net element - specifically, if a CIDR value is deleted such that none of the same size exist any more, all larger (less-specific) values will then fail to match. Adding back any prefix with a CIDR equal to or more specific than the one deleted will fix it.
Steps to reproduce:
ipset -N test hash:net
ipset -A test 1.1.0.0/16
ipset -A test 2.2.2.0/24
ipset -T test 1.1.1.1 #1.1.1.1 IS in set
ipset -D test 2.2.2.0/24
ipset -T test 1.1.1.1 #1.1.1.1 IS NOT in set
This is due to the fact that the nets counter was unconditionally decremented prior to the iteration that shifts up the entries. Now, we first check if there is a proceeding entry and if not, decrement it and return. Otherwise, we proceed to iterate and then zero the last element, which, in most cases, will already be zero.
--- net/netfilter/ipset/ip_set_hash_gen.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
net/netfilter/ipset/ip_set_hash_gen.h +16 -12
@@ -325,18 +325,22 @@ mtype_add_cidr(struct htype *h, u8 cidr, u8 nets_length)static void mtype_del_cidr (struct htype *h,u8 cidr,u8 nets_length) { -u8 i, j; - -for (i =0 ; i < nets_length -1 && h->nets[i].cidr != cidr; i++) - ; - h->nets[i].nets--; - -if (h->nets[i].nets !=0 ) -return ; - -for (j = i; j < nets_length -1 && h->nets[j].nets; j++) { - h->nets[j].cidr = h->nets[j +1 ].cidr; - h->nets[j].nets = h->nets[j +1 ].nets; +u8 i, j, net_end = nets_length -1 ; + +for (i =0 ; i < nets_length; i++) { +if (h->nets[i].cidr != cidr) +continue ; +if (h->nets[i].nets >1 || i == net_end || + h->nets[i +1 ].nets ==0 ) { + h->nets[i].nets--; +return ; + } +for (j = i; j < net_end && h->nets[j].nets; j++) { + h->nets[j].cidr = h->nets[j +1 ].cidr; + h->nets[j].nets = h->nets[j +1 ].nets; + } + h->nets[j].nets =0 ; +return ; } }#endif
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 7/7 netfilter: nfnetlink_queue: use network skb for sequence adjustment
In reply to Pablo Neira AyusoFrom: Gao feng <[email protected]>
Instead of the netlink skb.
--- net/netfilter/nfnetlink_queue_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nfnetlink_queue_core.c +1 -1
@@ -1009,7 +1009,7 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb, verdict =NF_DROP ;if (ct) -nfqnl_ct_seq_adjust (skb, ct, ctinfo, diff); +nfqnl_ct_seq_adjust (entry->skb, ct, ctinfo, diff); }if (nfqa[NFQA_MARK ])
Signature · 1 line
1.7.10.4