Message ID | 1513267513-11562-1-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: > When erspan_rcv call return PACKET_REJECT, we shoudn't call ipgre_rcv to > process packets again, instead send icmp unreachable message in error > path. > > Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") > Cc: William Tu <u9012063@gmail.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > --- Thanks for the patch. Acked-by: William Tu <u9012063@gmail.com>
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 9253d6f..61ee014 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -411,11 +411,13 @@ static int gre_rcv(struct sk_buff *skb) if (unlikely(tpi.proto == htons(ETH_P_ERSPAN))) { if (erspan_rcv(skb, &tpi, hdr_len) == PACKET_RCVD) return 0; + goto out; } if (ipgre_rcv(skb, &tpi, hdr_len) == PACKET_RCVD) return 0; +out: icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); drop: kfree_skb(skb);
When erspan_rcv call return PACKET_REJECT, we shoudn't call ipgre_rcv to process packets again, instead send icmp unreachable message in error path. Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") Cc: William Tu <u9012063@gmail.com> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> --- net/ipv4/ip_gre.c | 2 ++ 1 file changed, 2 insertions(+)