nf_nat: dont check for port change on ICMP tuples
Subsystems (2)
PATCH 1/1 nf_nat: dont check for port change on ICMP tuples
ICMP tuples have id in src and type/code in dst. So comparing src.u.all with dst.u.all will always fail here and ip_xfrm_me_harder() is called for every ICMP packet, even if there was no NAT...
Signed-off-by Ulrich Weber <[email protected]>
--- net/ipv4/netfilter/iptable_nat.c | 4 +++- net/ipv6/netfilter/ip6table_nat.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/netfilter/iptable_nat.c +3 -1
@@ -184,7 +184,8 @@ nf_nat_ipv4_out(unsigned int hooknum,if ((ct->tuplehash[dir].tuple.src.u3.ip != ct->tuplehash[!dir].tuple.dst.u3.ip) || - (ct->tuplehash[dir].tuple.src.u.all != + (ct->tuplehash[dir].tuple.dst.protonum !=IPPROTO_ICMP && + ct->tuplehash[dir].tuple.src.u.all != ct->tuplehash[!dir].tuple.dst.u.all))if (nf_xfrm_me_harder (skb,AF_INET ) <0 ) ret =NF_DROP ;
@@ -221,6 +222,7 @@ nf_nat_ipv4_local_fn(unsigned int hooknum, }#ifdef CONFIG_XFRM else if (!(IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED) && + ct->tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMP && ct->tuplehash[dir].tuple.dst.u.all != ct->tuplehash[!dir].tuple.src.u.all)if (nf_xfrm_me_harder (skb,AF_INET ) <0 )
net/ipv6/netfilter/ip6table_nat.c +3 -1
@@ -186,7 +186,8 @@ nf_nat_ipv6_out(unsigned int hooknum,if (!nf_inet_addr_cmp (&ct->tuplehash[dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3) || - (ct->tuplehash[dir].tuple.src.u.all != + (ct->tuplehash[dir].tuple.dst.protonum !=IPPROTO_ICMPV6 && + ct->tuplehash[dir].tuple.src.u.all != ct->tuplehash[!dir].tuple.dst.u.all))if (nf_xfrm_me_harder (skb,AF_INET6 ) <0 ) ret =NF_DROP ;
@@ -222,6 +223,7 @@ nf_nat_ipv6_local_fn(unsigned int hooknum, }#ifdef CONFIG_XFRM else if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) && + ct->tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMPV6 && ct->tuplehash[dir].tuple.dst.u.all != ct->tuplehash[!dir].tuple.src.u.all)if (nf_xfrm_me_harder (skb,AF_INET6 ))
Signature · 1 line
1.7.9.5
Quoted 4 lines · Ulrich Weber
ICMP tuples have id in src and type/code in dst. So comparing src.u.all with dst.u.all will always fail here and
ip_xfrm_me_harder()is called for every ICMP packet, even if there was no NAT...
Tracking the history, this seems to be there since really long time ago. I'll pass a backport of this to -stable.
Applied, thanks Ulrich.