hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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: c12b395a46 ("gre: Support GRE over IPv6")
Reported-by: Jianlin Shi <jishi@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2017-10-26 19:23:27 +08:00 committed by David S. Miller
parent f3594f0a7e
commit f8d20b46ce
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/ipv6/ip6_gre.c
View File

@ -408,13 +408,16 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
case ICMPV6_DEST_UNREACH: case ICMPV6_DEST_UNREACH:
net_dbg_ratelimited("%s: Path to destination invalid or inactive!\n", net_dbg_ratelimited("%s: Path to destination invalid or inactive!\n",
t->parms.name); t->parms.name);
break; if (code != ICMPV6_PORT_UNREACH)
break;
return;
case ICMPV6_TIME_EXCEED: case ICMPV6_TIME_EXCEED:
if (code == ICMPV6_EXC_HOPLIMIT) { if (code == ICMPV6_EXC_HOPLIMIT) {
net_dbg_ratelimited("%s: Too small hop limit or routing loop in tunnel!\n", net_dbg_ratelimited("%s: Too small hop limit or routing loop in tunnel!\n",
t->parms.name); t->parms.name);
break;
} }
break; return;
case ICMPV6_PARAMPROB: case ICMPV6_PARAMPROB:
teli = 0; teli = 0;
if (code == ICMPV6_HDR_FIELD) if (code == ICMPV6_HDR_FIELD)
@ -430,7 +433,7 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
net_dbg_ratelimited("%s: Recipient unable to parse tunneled packet!\n", net_dbg_ratelimited("%s: Recipient unable to parse tunneled packet!\n",
t->parms.name); t->parms.name);
} }
break; return;
case ICMPV6_PKT_TOOBIG: case ICMPV6_PKT_TOOBIG:
mtu = be32_to_cpu(info) - offset - t->tun_hlen; mtu = be32_to_cpu(info) - offset - t->tun_hlen;
if (t->dev->type == ARPHRD_ETHER) if (t->dev->type == ARPHRD_ETHER)
@ -438,7 +441,7 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
if (mtu < IPV6_MIN_MTU) if (mtu < IPV6_MIN_MTU)
mtu = IPV6_MIN_MTU; mtu = IPV6_MIN_MTU;
t->dev->mtu = mtu; t->dev->mtu = mtu;
break; return;
} }
if (time_before(jiffies, t->err_time + IP6TUNNEL_ERR_TIMEO)) if (time_before(jiffies, t->err_time + IP6TUNNEL_ERR_TIMEO))