Message ID | 1513267513-11562-2-git-send-email-yanhaishuang@cmss.chinamobile.com |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
Series | [1/2] ip_gre: fix error path when erspan_rcv failed | expand |
On Thu, Dec 14, 2017 at 8:05 AM, Haishuang Yan <yanhaishuang@cmss.chinamobile.com> wrote: > Same as ipv4 code, when ip6erspan_rcv call return PACKET_REJECT, we > should call icmpv6_send to send icmp unreachable message in error path. > > Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support") > Cc: William Tu <u9012063@gmail.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > --- Looks good to me. Thanks. Acked-by: William Tu <u9012063@gmail.com>
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index b8b0e4b..68e7eef 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -580,12 +580,13 @@ static int gre_rcv(struct sk_buff *skb) if (unlikely(tpi.proto == htons(ETH_P_ERSPAN))) { if (ip6erspan_rcv(skb, hdr_len, &tpi) == PACKET_RCVD) return 0; - goto drop; + goto out; } if (ip6gre_rcv(skb, &tpi) == PACKET_RCVD) return 0; +out: icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0); drop: kfree_skb(skb);
Same as ipv4 code, when ip6erspan_rcv call return PACKET_REJECT, we should call icmpv6_send to send icmp unreachable message in error path. Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support") Cc: William Tu <u9012063@gmail.com> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> --- net/ipv6/ip6_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)