Patch "ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err" has been added to the 3.18-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
to the 3.18-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:
ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch
and it can be found in the queue-3.18 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 Thu Nov 16 15:49:43 CET 2017
From: Xin Long <[email protected]>
Date: Thu, 26 Oct 2017 19:23:27 +0800
Subject: ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
From: Xin Long <[email protected]>
[ Upstream commit f8d20b46ce55cf40afb30dcef6d9288f7ef46d9b ]
The similar fix in patch 'ipip: only increase err_count for some certain type icmp in ipip_err' is needed for ip6gre_err.
In Jianlin's case, udp netperf broke even when receiving a TooBig icmpv6 packet.
--- net/ipv6/ip6_gre.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
net/ipv6/ip6_gre.c +7 -4
@@ -409,13 +409,16 @@ static void ip6gre_err(struct sk_buff *scase ICMPV6_DEST_UNREACH :net_warn_ratelimited ("%s: Path to destination invalid or inactive!\n" , t->parms.name); -break ; +if (code !=ICMPV6_PORT_UNREACH ) +break ; +return ;case ICMPV6_TIME_EXCEED :if (code ==ICMPV6_EXC_HOPLIMIT ) {net_warn_ratelimited ("%s: Too small hop limit or routing loop in tunnel!\n" , t->parms.name); +break ; } -break ; +return ;case ICMPV6_PARAMPROB : teli =0 ;if (code ==ICMPV6_HDR_FIELD )
@@ -431,13 +434,13 @@ static void ip6gre_err(struct sk_buff *snet_warn_ratelimited ("%s: Recipient unable to parse tunneled packet!\n" , t->parms.name); } -break ; +return ;case ICMPV6_PKT_TOOBIG : mtu =be32_to_cpu (info) - offset;if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ; t->dev->mtu = mtu; -break ; +return ; }if (time_before (jiffies, t->err_time +IP6TUNNEL_ERR_TIMEO ))
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/sctp-reset-owner-sk-for-data-chunks-on-out-queues-when-migrating-a-sock.patch queue-3.18/ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch queue-3.18/sctp-add-the-missing-sock_owned_by_user-check-in-sctp_icmp_redirect.patch queue-3.18/ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch