Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb36c7de authored by Xin Long's avatar Xin Long Committed by Greg Kroah-Hartman
Browse files

ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err 




[ 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.

Fixes: c12b395a ("gre: Support GRE over IPv6")
Reported-by: default avatarJianlin Shi <jishi@redhat.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53380d17

net/ipv6/ip6_gre.c

+7 −4
Original line number Diff line number Diff line
@@ -409,13 +409,16 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	case ICMPV6_DEST_UNREACH:

		net_warn_ratelimited("%s: Path to destination invalid or inactive!\n",

				     t->parms.name);

		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;

		}

		return;

	case ICMPV6_PARAMPROB:

		teli = 0;

		if (code == ICMPV6_HDR_FIELD)
@@ -431,13 +434,13 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
			net_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))