Netfilter/IPVS fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter/IPVS fixes for net
Hi David,
The following patchset contains two fixes for Netfilter/IPVS, they are:
* A skb leak fix in fragmentation handling in case that helpers are in place, it occurs since the IPV6 NAT infrastructure, from Phil Oester.
* Fix SCTP port mangling in ICMP packets, from Julian Anastasov.
Specifically, the first one should find its path to -stable asap. I can take care myself of it once this hits Linus' tree, let me know what you prefer.
You can pull these changes from:
Julian Anastasov (1):
ipvs: SCTP ports should be writable in ICMP packets
Phil Oester (1):
netfilter: nf_conntrack_ipv6: Plug sk_buff leak in fragment handling
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +- net/netfilter/ipvs/ip_vs_core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/2 ipvs: SCTP ports should be writable in ICMP packets
From: Julian Anastasov <[email protected]>
Make sure that SCTP ports are writable when embedded in ICMP from client, so that ip_vs_nat_icmp can translate them safely.
--- net/netfilter/ipvs/ip_vs_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/ipvs/ip_vs_core.c +2 -1
@@ -1442,7 +1442,8 @@ ignore_ipip:/* do the statistics and put it back */ ip_vs_in_stats (cp, skb); -if (IPPROTO_TCP == cih->protocol ||IPPROTO_UDP == cih->protocol) +if (IPPROTO_TCP == cih->protocol ||IPPROTO_UDP == cih->protocol || +IPPROTO_SCTP == cih->protocol) offset +=2 *sizeof (__u16); verdict =ip_vs_icmp_xmit (skb, cp, pp, offset, hooknum, &ciph);
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nf_conntrack_ipv6: Plug sk_buff leak in fragment handling
In reply to Pablo Neira AyusoFrom: Phil Oester <[email protected]>
In commit 4cdd3408 ("netfilter: nf_conntrack_ipv6: improve fragmentation handling"), an sk_buff leak was introduced when dealing with reassembled packets by grabbing a reference to the original skb instead of the reassembled skb. At this point, the leak only impacted conntracks with an associated helper.
In commit 58a317f1 ("netfilter: ipv6: add IPv6 NAT support"), the bug was expanded to include all reassembled packets with unconfirmed conntracks.
Fix this by grabbing a reference to the proper reassembled skb. This closes netfilter bugzilla #823.
--- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +1 -1
@@ -204,7 +204,7 @@ static unsigned int __ipv6_conntrack_in(struct net *net,if (ct !=NULL && !nf_ct_is_untracked (ct)) { help =nfct_help (ct);if ((help && help->helper) || !nf_ct_is_confirmed (ct)) { -nf_conntrack_get_reasm (skb); +nf_conntrack_get_reasm (reasm); NF_HOOK_THRESH(NFPROTO_IPV6, hooknum, reasm, (struct net_device *)in, (struct net_device *)out,
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Fri, 21 Jun 2013 02:38:39 +0200
Quoted 3 lines
You can pull these changes from:
No URL specified :-)
Pablo Neira Ayuso
maintainerQuoted 8 lines · David Miller
From: Pablo Neira Ayuso <[email protected]>
Date: Fri, 21 Jun 2013 02:38:39 +0200Quoted 3 lines
You can pull these changes from:
No URL specified :-)
Oops :-(, I puzzled with my pull request script, sorry.
Will retry asap.