Patch "ipip: only increase err_count for some certain type icmp in ipip_err" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
ipip: only increase err_count for some certain type icmp in ipip_err
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Nov 15 17:24:03 CET 2017
From: Xin Long <[email protected]>
Date: Thu, 26 Oct 2017 19:19:56 +0800
Subject: ipip: only increase err_count for some certain type icmp in ipip_err
From: Xin Long <[email protected]>
[ Upstream commit f3594f0a7ea36661d7fd942facd7f31a64245f1a ]
t->err_count is used to count the link failure on tunnel and an err will be reported to user socket in tx path if t->err_count is not 0. udp socket could even return EHOSTUNREACH to users.
Since commit fd58156e456d ("IPIP: Use ip-tunneling code.") removed the 'switch check' for icmp type in ipip_err(), err_count would be increased by the icmp packet with ICMP_EXC_FRAGTIME code. an link failure would be reported out due to this.
In Jianlin's case, when receiving ICMP_EXC_FRAGTIME a icmp packet, udp netperf failed with the err:
send_data: data send error: No route to host (errno 113)
We expect this error reported from tunnel to socket when receiving some certain type icmp, but not ICMP_EXC_FRAGTIME, ICMP_SR_FAILED or ICMP_PARAMETERPROB ones.
This patch is to bring 'switch check' for icmp type back to ipip_err so that it only reports link failure for the right type icmp, just as in ipgre_err() and ipip6_err().
--- net/ipv4/ipip.c | 59 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 17 deletions(-)
net/ipv4/ipip.c +42 -17
@@ -128,43 +128,68 @@ static struct rtnl_link_ops ipip_link_opstatic int ipip_err (struct sk_buff *skb,u32 info) { - -/* All the routers (except for Linux) return only -8 bytes of packet payload. It means, that precise relaying of -ICMP in the real Internet is absolutely infeasible. -*/ +/* All the routers (except for Linux) return only +* 8 bytes of packet payload. It means, that precise relaying of +* ICMP in the real Internet is absolutely infeasible. +*/ struct net *net =dev_net (skb->dev);struct ip_tunnel_net *itn =net_generic (net, ipip_net_id);const struct iphdr *iph = (const struct iphdr *)skb->data; -struct ip_tunnel *t; -int err;const int type =icmp_hdr (skb)->type;const int code =icmp_hdr (skb)->code; +struct ip_tunnel *t; +int err =0 ; + +switch (type) { +case ICMP_DEST_UNREACH : +switch (code) { +case ICMP_SR_FAILED : +/* Impossible event. */ + goto out; +default : +/* All others are translated to HOST_UNREACH. +* rfc2003 contains "deep thoughts" about NET_UNREACH, +* I believe they are just ether pollution. --ANK +*/ +break ; + } +break ; + +case ICMP_TIME_EXCEEDED : +if (code !=ICMP_EXC_TTL ) + goto out; +break ; + +case ICMP_REDIRECT : +break ; + +default : + goto out; + } - err = -ENOENT ; t =ip_tunnel_lookup (itn, skb->dev->ifindex,TUNNEL_NO_KEY , iph->daddr, iph->saddr,0 ); -if (!t) +if (!t) { + err = -ENOENT ; goto out; + }if (type ==ICMP_DEST_UNREACH && code ==ICMP_FRAG_NEEDED ) { -ipv4_update_pmtu (skb,dev_net (skb->dev), info, - t->parms.link,0 , iph->protocol,0 ); - err =0 ; +ipv4_update_pmtu (skb, net, info, t->parms.link,0 , + iph->protocol,0 ); goto out; }if (type ==ICMP_REDIRECT ) { -ipv4_redirect (skb,dev_net (skb->dev), t->parms.link,0 , - iph->protocol,0 ); - err =0 ; +ipv4_redirect (skb, net, t->parms.link,0 , iph->protocol,0 ); goto out; } -if (t->parms.iph.daddr ==0 ) +if (t->parms.iph.daddr ==0 ) { + err = -ENOENT ; goto out; + } - err =0 ;if (t->parms.iph.ttl ==0 && type ==ICMP_TIME_EXCEEDED ) goto out;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/sctp-reset-owner-sk-for-data-chunks-on-out-queues-when-migrating-a-sock.patch queue-4.9/ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch queue-4.9/sctp-full-support-for-ipv6-ip_nonlocal_bind-ip_freebind.patch queue-4.9/sctp-add-the-missing-sock_owned_by_user-check-in-sctp_icmp_redirect.patch queue-4.9/ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch queue-4.9/ip6_gre-update-dst-pmtu-if-dev-mtu-has-been-updated-by-toobig-in-__gre6_xmit.patch