netfilter fixes for 3.0.0-rc1 (try 2)
Subsystems (3)
[email protected]
maintainercover netfilter fixes for 3.0.0-rc1 (try 2)
From: Pablo Neira Ayuso <[email protected]>
Hi David,
the following patches contain Netfilter fixes for 3.0.0-rc1. The highlights are:
- fix compilation warning in conntrack with recent gcc versions by Eric.
- a couple of minor fixes for ipset from Jozsef.
- one fix for IPVS with SNAT from Julian Anastasov.
- one fix for NAT and checksumming also from Julian.
- fix refcount leak in conntrack with ICMP[v6] by myself.
You can pull them from:
git://1984.lsi.us.es/net-2.6 pablo/nf-2.6-updates
Thanks!
Dave Jones (1):
netfilter: use unsigned variables for packet lengths in ip[6]_queue.
Eric Dumazet (1):
netfilter: add more values to enum ip_conntrack_info
Jozsef Kadlecsik (2):
netfilter: ipset: Fix return code for destroy when sets are in use
netfilter: ipset: Use the stored first cidr value instead of '1'
Julian Anastasov (2):
ipvs: restore support for iptables SNAT
netfilter: nf_nat: fix crash in nf_nat_csum
Pablo Neira Ayuso (1):
netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()
include/linux/netfilter/nf_conntrack_common.h | 3 +++ net/ipv4/netfilter/ip_queue.c | 3 ++- net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +++--- net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- net/ipv4/netfilter/nf_nat_core.c | 2 +- net/ipv4/netfilter/nf_nat_helper.c | 2 +- net/ipv4/netfilter/nf_nat_rule.c | 2 +- net/ipv4/netfilter/nf_nat_standalone.c | 4 ++-- net/ipv6/netfilter/ip6_queue.c | 3 ++- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- net/netfilter/ipset/ip_set_core.c | 2 +- net/netfilter/ipset/ip_set_hash_ipportnet.c | 10 ++++++---- net/netfilter/ipset/ip_set_hash_net.c | 8 ++++++-- net/netfilter/ipset/ip_set_hash_netport.c | 6 ++++-- net/netfilter/ipvs/ip_vs_core.c | 16 ++++++++-------- net/netfilter/nf_conntrack_core.c | 7 +++++-- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_h323_main.c | 10 ++++------ net/netfilter/nf_conntrack_irc.c | 3 +-- net/netfilter/nf_conntrack_pptp.c | 3 +-- net/netfilter/nf_conntrack_sane.c | 2 +- net/netfilter/nf_conntrack_sip.c | 2 +- net/netfilter/xt_socket.c | 4 ++-- 26 files changed, 61 insertions(+), 49 deletions(-)
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 1/7 netfilter: add more values to enum ip_conntrack_info
From: Eric Dumazet <[email protected]>
Following error is raised (and other similar ones) :
net/ipv4/netfilter/nf_nat_standalone.c: In function ‘nf_nat_fn’:net/ipv4/netfilter/nf_nat_standalone.c:119:2: warning: case value ‘4’ not in enumerated type ‘enum ip_conntrack_info’
gcc barfs on adding two enum values and getting a not enumerated result :
case IP_CT_RELATED+IP_CT_IS_REPLY:
Add missing enum values
--- include/linux/netfilter/nf_conntrack_common.h | 3 +++ net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +++--- net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- net/ipv4/netfilter/nf_nat_core.c | 2 +- net/ipv4/netfilter/nf_nat_rule.c | 2 +- net/ipv4/netfilter/nf_nat_standalone.c | 4 ++-- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +- net/netfilter/nf_conntrack_core.c | 4 ++-- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_h323_main.c | 10 ++++------ net/netfilter/nf_conntrack_irc.c | 3 +-- net/netfilter/nf_conntrack_pptp.c | 3 +-- net/netfilter/nf_conntrack_sane.c | 2 +- net/netfilter/nf_conntrack_sip.c | 2 +- net/netfilter/xt_socket.c | 4 ++-- 16 files changed, 26 insertions(+), 27 deletions(-)
include/linux/netfilter/nf_conntrack_common.h +3 -0
@@ -18,6 +18,9 @@ enum ip_conntrack_info {/* >= this indicates reply direction */ IP_CT_IS_REPLY , +IP_CT_ESTABLISHED_REPLY =IP_CT_ESTABLISHED +IP_CT_IS_REPLY , +IP_CT_RELATED_REPLY =IP_CT_RELATED +IP_CT_IS_REPLY , +IP_CT_NEW_REPLY =IP_CT_NEW +IP_CT_IS_REPLY ,/* Number of distinct IP_CT types (no NEW in reply dirn). */ IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1 };
net/ipv4/netfilter/ipt_CLUSTERIP.c +3 -3
@@ -307,7 +307,7 @@ clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par)* error messages (RELATED) and information requests (see below) */ if (ip_hdr (skb)->protocol ==IPPROTO_ICMP && (ctinfo ==IP_CT_RELATED || - ctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY )) + ctinfo ==IP_CT_RELATED_REPLY ))return XT_CONTINUE ;/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO,
@@ -321,12 +321,12 @@ clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par) ct->mark = hash;break ;case IP_CT_RELATED : -case IP_CT_RELATED +IP_CT_IS_REPLY : +case IP_CT_RELATED_REPLY :/* FIXME: we don't handle expectations at the * moment. they can arrive on a different node than * the master connection (e.g. FTP passive mode) */ case IP_CT_ESTABLISHED : -case IP_CT_ESTABLISHED +IP_CT_IS_REPLY : +case IP_CT_ESTABLISHED_REPLY :break ;default :break ;
net/ipv4/netfilter/ipt_MASQUERADE.c +1 -1
@@ -60,7 +60,7 @@ masquerade_tg(struct sk_buff *skb, const struct xt_action_param *par) nat =nfct_nat (ct);NF_CT_ASSERT (ct && (ctinfo ==IP_CT_NEW || ctinfo ==IP_CT_RELATED || - ctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY )); + ctinfo ==IP_CT_RELATED_REPLY ));/* Source address is 0.0.0.0 - locally generated packet that is * probably not supposed to be masqueraded.
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +1 -1
@@ -101,7 +101,7 @@ static unsigned int ipv4_confirm(unsigned int hooknum,/* This is where we call the helper: as the packet goes out. */ ct =nf_ct_get (skb, &ctinfo); -if (!ct || ctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY ) +if (!ct || ctinfo ==IP_CT_RELATED_REPLY ) goto out; help =nfct_help (ct);
net/ipv4/netfilter/nf_nat_core.c +1 -1
@@ -433,7 +433,7 @@ int nf_nat_icmp_reply_translation(struct nf_conn *ct,/* Must be RELATED */ NF_CT_ASSERT (skb->nfctinfo ==IP_CT_RELATED || - skb->nfctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY ); + skb->nfctinfo ==IP_CT_RELATED_REPLY );/* Redirects on non-null nats must be dropped, else they'll start talking to each other without our translation, and be
net/ipv4/netfilter/nf_nat_rule.c +1 -1
@@ -53,7 +53,7 @@ ipt_snat_target(struct sk_buff *skb, const struct xt_action_param *par)/* Connection must be valid and new. */ NF_CT_ASSERT (ct && (ctinfo ==IP_CT_NEW || ctinfo ==IP_CT_RELATED || - ctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY )); + ctinfo ==IP_CT_RELATED_REPLY ));NF_CT_ASSERT (par->out !=NULL );return nf_nat_setup_info (ct, &mr->range[0 ],IP_NAT_MANIP_SRC );
net/ipv4/netfilter/nf_nat_standalone.c +2 -2
@@ -116,7 +116,7 @@ nf_nat_fn(unsigned int hooknum,switch (ctinfo) {case IP_CT_RELATED : -case IP_CT_RELATED +IP_CT_IS_REPLY : +case IP_CT_RELATED_REPLY :if (ip_hdr (skb)->protocol ==IPPROTO_ICMP ) {if (!nf_nat_icmp_reply_translation (ct, ctinfo, hooknum, skb))
@@ -144,7 +144,7 @@ nf_nat_fn(unsigned int hooknum,default :/* ESTABLISHED */ NF_CT_ASSERT (ctinfo ==IP_CT_ESTABLISHED || - ctinfo == (IP_CT_ESTABLISHED +IP_CT_IS_REPLY )); + ctinfo ==IP_CT_ESTABLISHED_REPLY ); }return nf_nat_packet (ct, ctinfo, hooknum, skb);
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +1 -1
@@ -160,7 +160,7 @@ static unsigned int ipv6_confirm(unsigned int hooknum,/* This is where we call the helper: as the packet goes out. */ ct =nf_ct_get (skb, &ctinfo); -if (!ct || ctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY ) +if (!ct || ctinfo ==IP_CT_RELATED_REPLY ) goto out; help =nfct_help (ct);
net/netfilter/nf_conntrack_core.c +2 -2
@@ -850,7 +850,7 @@ resolve_normal_ct(struct net *net, struct nf_conn *tmpl,/* It exists; we have (non-exclusive) reference. */ if (NF_CT_DIRECTION (h) ==IP_CT_DIR_REPLY ) { - *ctinfo =IP_CT_ESTABLISHED +IP_CT_IS_REPLY ; + *ctinfo =IP_CT_ESTABLISHED_REPLY ;/* Please set reply bit if this packet OK */ *set_reply =1 ; }else {
@@ -1143,7 +1143,7 @@ static void nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb)/* This ICMP is in reverse direction to the packet which caused it */ ct =nf_ct_get (skb, &ctinfo);if (CTINFO2DIR (ctinfo) ==IP_CT_DIR_ORIGINAL ) - ctinfo =IP_CT_RELATED +IP_CT_IS_REPLY ; + ctinfo =IP_CT_RELATED_REPLY ;else ctinfo =IP_CT_RELATED ;
net/netfilter/nf_conntrack_ftp.c +1 -1
@@ -368,7 +368,7 @@ static int help(struct sk_buff *skb,/* Until there's been traffic both ways, don't look in packets. */ if (ctinfo !=IP_CT_ESTABLISHED && - ctinfo !=IP_CT_ESTABLISHED +IP_CT_IS_REPLY ) { + ctinfo !=IP_CT_ESTABLISHED_REPLY ) {pr_debug ("ftp: Conntrackinfo = %u\n" , ctinfo);return NF_ACCEPT ; }
net/netfilter/nf_conntrack_h323_main.c +4 -6
@@ -571,10 +571,9 @@ static int h245_help(struct sk_buff *skb, unsigned int protoff,int ret;/* Until there's been traffic both ways, don't look in packets. */ -if (ctinfo !=IP_CT_ESTABLISHED && - ctinfo !=IP_CT_ESTABLISHED +IP_CT_IS_REPLY ) { +if (ctinfo !=IP_CT_ESTABLISHED && ctinfo !=IP_CT_ESTABLISHED_REPLY )return NF_ACCEPT ; - } +pr_debug ("nf_ct_h245: skblen = %u\n" , skb->len);spin_lock_bh (&nf_h323_lock);
@@ -1125,10 +1124,9 @@ static int q931_help(struct sk_buff *skb, unsigned int protoff,int ret;/* Until there's been traffic both ways, don't look in packets. */ -if (ctinfo !=IP_CT_ESTABLISHED && - ctinfo !=IP_CT_ESTABLISHED +IP_CT_IS_REPLY ) { +if (ctinfo !=IP_CT_ESTABLISHED && ctinfo !=IP_CT_ESTABLISHED_REPLY )return NF_ACCEPT ; - } +pr_debug ("nf_ct_q931: skblen = %u\n" , skb->len);spin_lock_bh (&nf_h323_lock);
net/netfilter/nf_conntrack_irc.c +1 -2
@@ -125,8 +125,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,return NF_ACCEPT ;/* Until there's been traffic both ways, don't look in packets. */ -if (ctinfo !=IP_CT_ESTABLISHED && - ctinfo !=IP_CT_ESTABLISHED +IP_CT_IS_REPLY ) +if (ctinfo !=IP_CT_ESTABLISHED && ctinfo !=IP_CT_ESTABLISHED_REPLY )return NF_ACCEPT ;/* Not a full tcp header? */
net/netfilter/nf_conntrack_pptp.c +1 -2
@@ -519,8 +519,7 @@ conntrack_pptp_help(struct sk_buff *skb, unsigned int protoff,u_int16_t msg;/* don't do any tracking before tcp handshake complete */ -if (ctinfo !=IP_CT_ESTABLISHED && - ctinfo !=IP_CT_ESTABLISHED +IP_CT_IS_REPLY ) +if (ctinfo !=IP_CT_ESTABLISHED && ctinfo !=IP_CT_ESTABLISHED_REPLY )return NF_ACCEPT ; nexthdr_off = protoff;
net/netfilter/nf_conntrack_sane.c +1 -1
@@ -78,7 +78,7 @@ static int help(struct sk_buff *skb, ct_sane_info = &nfct_help (ct)->help.ct_sane_info;/* Until there's been traffic both ways, don't look in packets. */ if (ctinfo !=IP_CT_ESTABLISHED && - ctinfo !=IP_CT_ESTABLISHED +IP_CT_IS_REPLY ) + ctinfo !=IP_CT_ESTABLISHED_REPLY )return NF_ACCEPT ;/* Not a full tcp header? */
net/netfilter/nf_conntrack_sip.c +1 -1
@@ -1423,7 +1423,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff,typeof (nf_nat_sip_seq_adjust_hook) nf_nat_sip_seq_adjust;if (ctinfo !=IP_CT_ESTABLISHED && - ctinfo !=IP_CT_ESTABLISHED +IP_CT_IS_REPLY ) + ctinfo !=IP_CT_ESTABLISHED_REPLY )return NF_ACCEPT ;/* No Data ? */
net/netfilter/xt_socket.c +2 -2
@@ -143,9 +143,9 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, ct =nf_ct_get (skb, &ctinfo);if (ct && !nf_ct_is_untracked (ct) && ((iph->protocol !=IPPROTO_ICMP && - ctinfo ==IP_CT_IS_REPLY +IP_CT_ESTABLISHED ) || + ctinfo ==IP_CT_ESTABLISHED_REPLY ) || (iph->protocol ==IPPROTO_ICMP && - ctinfo ==IP_CT_IS_REPLY +IP_CT_RELATED )) && + ctinfo ==IP_CT_RELATED_REPLY )) && (ct->status &IPS_SRC_NAT_DONE )) { daddr = ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.src.u3.ip;
Signature · 6 lines
1.7.2.5 -- 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
[email protected]
maintainerPATCH 2/7 ipvs: restore support for iptables SNAT
In reply to [email protected]From: Julian Anastasov <[email protected]>
Fix the IPVS priority in LOCAL_IN hook,
so that SNAT target in POSTROUTING is supported for IPVS traffic as in 2.6.36 where it worked depending on module load order.
Before 2.6.37 we used priority 100 in LOCAL_IN to
process remote requests. We used the same priority as iptables SNAT and if IPVS handlers are installed before SNAT handlers we supported SNAT in POSTROUTING for the IPVS traffic. If SNAT is installed before IPVS, the netfilter handlers are before IPVS and netfilter checks the NAT table twice for the IPVS requests: once in LOCAL_IN where IPS_SRC_NAT_DONE is set and second time in POSTROUTING where the SNAT rules are ignored because IPS_SRC_NAT_DONE was already set in LOCAL_IN.
But in 2.6.37 we changed the IPVS priority forLOCAL_IN with the goal to be unique (101) forgetting the fact that for IPVS traffic we should not walk both LOCAL_IN and POSTROUTING nat tables.
So, change the priority for processing remote
IPVS requests from 101 to 99, i.e. before NAT_SRC (100) because we prefer to support SNAT in POSTROUTING instead of LOCAL_IN. It also moves the priority for IPVS replies from 99 to 98. Use constants instead of magic numbers at these places.
--- net/netfilter/ipvs/ip_vs_core.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +8 -8
@@ -1772,7 +1772,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET, .hooknum = NF_INET_LOCAL_IN, - .priority = 99, + .priority = NF_IP_PRI_NAT_SRC - 2, },/* After packet filtering, forward packet through VS/DR, VS/TUN, * or VS/NAT(change destination), so that filtering rules can be
@@ -1782,7 +1782,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET, .hooknum = NF_INET_LOCAL_IN, - .priority = 101, + .priority = NF_IP_PRI_NAT_SRC - 1, },/* Before ip_vs_in, change source only for VS/NAT */ {
@@ -1790,7 +1790,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET, .hooknum = NF_INET_LOCAL_OUT, - .priority = -99, + .priority = NF_IP_PRI_NAT_DST + 1, },/* After mangle, schedule and forward local requests */ {
@@ -1798,7 +1798,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET, .hooknum = NF_INET_LOCAL_OUT, - .priority = -98, + .priority = NF_IP_PRI_NAT_DST + 2, },/* After packet filtering (but before ip_vs_out_icmp), catch icmp * destined for 0.0.0.0/0, which is for incoming IPVS connections */
@@ -1824,7 +1824,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET6, .hooknum = NF_INET_LOCAL_IN, - .priority = 99, + .priority = NF_IP6_PRI_NAT_SRC - 2, },/* After packet filtering, forward packet through VS/DR, VS/TUN, * or VS/NAT(change destination), so that filtering rules can be
@@ -1834,7 +1834,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET6, .hooknum = NF_INET_LOCAL_IN, - .priority = 101, + .priority = NF_IP6_PRI_NAT_SRC - 1, },/* Before ip_vs_in, change source only for VS/NAT */ {
@@ -1842,7 +1842,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET, .hooknum = NF_INET_LOCAL_OUT, - .priority = -99, + .priority = NF_IP6_PRI_NAT_DST + 1, },/* After mangle, schedule and forward local requests */ {
@@ -1850,7 +1850,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { .owner = THIS_MODULE, .pf = PF_INET6, .hooknum = NF_INET_LOCAL_OUT, - .priority = -98, + .priority = NF_IP6_PRI_NAT_DST + 2, },/* After packet filtering (but before ip_vs_out_icmp), catch icmp * destined for 0.0.0.0/0, which is for incoming IPVS connections */
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 3/7 netfilter: ipset: Fix return code for destroy when sets are in use
In reply to [email protected]From: Jozsef Kadlecsik <[email protected]>
--- net/netfilter/ipset/ip_set_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/netfilter/ipset/ip_set_core.c +1 -1
@@ -767,7 +767,7 @@ ip_set_destroy(struct sock *ctnl, struct sk_buff *skb,if (!attr[IPSET_ATTR_SETNAME ]) {for (i =0 ; i < ip_set_max; i++) {if (ip_set_list[i] !=NULL && ip_set_list[i]->ref) { - ret =IPSET_ERR_BUSY ; + ret = -IPSET_ERR_BUSY ; goto out; } }
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 4/7 netfilter: ipset: Use the stored first cidr value instead of '1'
In reply to [email protected]From: Jozsef Kadlecsik <[email protected]>
The stored cidr values are tried one after anoter. The boolean condition evaluated to '1' instead of the first stored cidr or the default host cidr.
--- net/netfilter/ipset/ip_set_hash_ipportnet.c | 10 ++++++---- net/netfilter/ipset/ip_set_hash_net.c | 8 ++++++-- net/netfilter/ipset/ip_set_hash_netport.c | 6 ++++-- 3 files changed, 16 insertions(+), 8 deletions(-)
net/netfilter/ipset/ip_set_hash_ipportnet.c +6 -4
@@ -146,8 +146,9 @@ hash_ipportnet4_kadt(struct ip_set *set, const struct sk_buff *skb, {const struct ip_set_hash *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_ipportnet4_elem data = - { .cidr = h->nets[0 ].cidr ||HOST_MASK }; +struct hash_ipportnet4_elem data = { + .cidr = h->nets[0 ].cidr ? h->nets[0 ].cidr :HOST_MASK + };if (data.cidr ==0 )return -EINVAL ;
@@ -394,8 +395,9 @@ hash_ipportnet6_kadt(struct ip_set *set, const struct sk_buff *skb, {const struct ip_set_hash *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_ipportnet6_elem data = - { .cidr = h->nets[0 ].cidr ||HOST_MASK }; +struct hash_ipportnet6_elem data = { + .cidr = h->nets[0 ].cidr ? h->nets[0 ].cidr :HOST_MASK + };if (data.cidr ==0 )return -EINVAL ;
net/netfilter/ipset/ip_set_hash_net.c +6 -2
@@ -131,7 +131,9 @@ hash_net4_kadt(struct ip_set *set, const struct sk_buff *skb, {const struct ip_set_hash *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_net4_elem data = { .cidr = h->nets[0 ].cidr ||HOST_MASK }; +struct hash_net4_elem data = { + .cidr = h->nets[0 ].cidr ? h->nets[0 ].cidr :HOST_MASK + };if (data.cidr ==0 )return -EINVAL ;
@@ -296,7 +298,9 @@ hash_net6_kadt(struct ip_set *set, const struct sk_buff *skb, {const struct ip_set_hash *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_net6_elem data = { .cidr = h->nets[0 ].cidr ||HOST_MASK }; +struct hash_net6_elem data = { + .cidr = h->nets[0 ].cidr ? h->nets[0 ].cidr :HOST_MASK + };if (data.cidr ==0 )return -EINVAL ;
net/netfilter/ipset/ip_set_hash_netport.c +4 -2
@@ -144,7 +144,8 @@ hash_netport4_kadt(struct ip_set *set, const struct sk_buff *skb,const struct ip_set_hash *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_netport4_elem data = { - .cidr = h->nets[0 ].cidr ||HOST_MASK }; + .cidr = h->nets[0 ].cidr ? h->nets[0 ].cidr :HOST_MASK + };if (data.cidr ==0 )return -EINVAL ;
@@ -357,7 +358,8 @@ hash_netport6_kadt(struct ip_set *set, const struct sk_buff *skb,const struct ip_set_hash *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt];struct hash_netport6_elem data = { - .cidr = h->nets[0 ].cidr ||HOST_MASK }; + .cidr = h->nets[0 ].cidr ? h->nets[0 ].cidr :HOST_MASK + };if (data.cidr ==0 )return -EINVAL ;
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 5/7 netfilter: nf_nat: fix crash in nf_nat_csum
In reply to [email protected]From: Julian Anastasov <[email protected]>
Fix crash in nf_nat_csum when mangling packets
in OUTPUT hook where skb->dev is not defined, it is set later before POSTROUTING. Problem happens for CHECKSUM_NONE. We can check device from rt but using CHECKSUM_PARTIAL should be safe (skb_checksum_help).
--- net/ipv4/netfilter/nf_nat_helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/ipv4/netfilter/nf_nat_helper.c +1 -1
@@ -160,7 +160,7 @@ static void nf_nat_csum(struct sk_buff *skb, const struct iphdr *iph, void *dataif (skb->ip_summed !=CHECKSUM_PARTIAL ) {if (!(rt->rt_flags &RTCF_LOCAL ) && - skb->dev->features &NETIF_F_V4_CSUM ) { + (!skb->dev || skb->dev->features &NETIF_F_V4_CSUM )) { skb->ip_summed =CHECKSUM_PARTIAL ; skb->csum_start =skb_headroom (skb) + skb_network_offset(skb) +
Signature · 1 line
1.7.2.5
[email protected]
maintainerPATCH 6/7 netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()
In reply to [email protected]From: Pablo Neira Ayuso <[email protected]>
This patch fixes a refcount leak of ct objects that may occur if l4proto->error() assigns one conntrack object to one skbuff. In that case, we have to skip further processing in nf_conntrack_in().
With this patch, we can also fix wrong return values (-NF_ACCEPT) for special cases in ICMP[v6] that should not bump the invalid/error statistic counters.
--- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- net/netfilter/nf_conntrack_core.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-)
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +1 -1
@@ -160,7 +160,7 @@ icmp_error_message(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb,/* Update skb to refer to this connection */ skb->nfct = &nf_ct_tuplehash_to_ctrack (h)->ct_general; skb->nfctinfo = *ctinfo; -return -NF_ACCEPT ; +return NF_ACCEPT ; }/* Small and modified version of icmp_rcv */
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +1 -1
@@ -177,7 +177,7 @@ icmpv6_error_message(struct net *net, struct nf_conn *tmpl,/* Update skb to refer to this connection */ skb->nfct = &nf_ct_tuplehash_to_ctrack (h)->ct_general; skb->nfctinfo = *ctinfo; -return -NF_ACCEPT ; +return NF_ACCEPT ; } static int
net/netfilter/nf_conntrack_core.c +3 -0
@@ -922,6 +922,9 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum, ret = -ret; goto out; } +/* ICMP[v6] protocol trackers may assign one conntrack. */ +if (skb->nfct) + goto out; } ct = resolve_normal_ct(net, tmpl, skb, dataoff, pf, protonum,
Signature · 1 line
1.7.2.5
Re: [PATCH 6/7] netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()
Hello,
06.06.2011, 04:11, [email protected]:
Quoted 3 lines
With this patch, we can also fix wrong return values (-NF_ACCEPT) for special cases in ICMP[v6] that should not bump the invalid/error statistic counters.
Are you sure? Please, look here:
http://www.spinics.net/lists/netfilter-devel/msg15520.html
Thank you!
Signature · 1 line
wbr, Oleg.
Pablo Neira Ayuso
maintainerRe: [PATCH 6/7] netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()
Quoted 11 lines · Oleg A. Arkhangelsky
Hello,
06.06.2011, 04:11, [email protected]:
Quoted 3 lines
With this patch, we can also fix wrong return values (-NF_ACCEPT) for special cases in ICMP[v6] that should not bump the invalid/error statistic counters.
Are you sure? Please, look here:
We now check if we have one skb->nfct after l4proto->error(), so that affirmation doesn't apply anymore.
[email protected]
maintainerPATCH 7/7 netfilter: use unsigned variables for packet lengths in ip[6]_queue.
In reply to [email protected]From: Dave Jones <[email protected]>
Netlink message lengths can't be negative, so use unsigned variables.
--- net/ipv4/netfilter/ip_queue.c | 3 ++- net/ipv6/netfilter/ip6_queue.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ip_queue.c +2 -1
@@ -402,7 +402,8 @@ ipq_dev_drop(int ifindex)static inline void __ipq_rcv_skb (struct sk_buff *skb) { -int status, type, pid, flags, nlmsglen, skblen; +int status, type, pid, flags; +unsigned int nlmsglen, skblen;struct nlmsghdr *nlh; skblen = skb->len;
net/ipv6/netfilter/ip6_queue.c +2 -1
@@ -403,7 +403,8 @@ ipq_dev_drop(int ifindex)static inline void __ipq_rcv_skb (struct sk_buff *skb) { -int status, type, pid, flags, nlmsglen, skblen; +int status, type, pid, flags; +unsigned int nlmsglen, skblen;struct nlmsghdr *nlh; skblen = skb->len;
Signature · 1 line
1.7.2.5
David Miller
maintainerFrom: [email protected]
Date: Mon, 6 Jun 2011 02:11:33 +0200
Quoted 6 lines
- fix compilation warning in conntrack with recent gcc versions by Eric.
- a couple of minor fixes for ipset from Jozsef.
- one fix for IPVS with SNAT from Julian Anastasov.
Quoted 7 lines
- one fix for NAT and checksumming also from Julian.
- fix refcount leak in conntrack with ICMP[v6] by myself.
You can pull them from:
git://1984.lsi.us.es/net-2.6pablo/nf-2.6-updates
Pulled, thanks a lot!