diff options
| author |   Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2017-12-20 10:21:46 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-12-20 13:51:46 -0500 |
| commit | dd8d5b8c5b22e31079b259b8bfb686f1fac1080a (patch) | |
| tree | 2969897e4a103a9e3ddf3837a9b940f8905a8943 /net/ipv4/ip_gre.c | |
| parent | ip6_gre: fix a pontential issue in ip6erspan_rcv (diff) | |
| download | linux-dev-dd8d5b8c5b22e31079b259b8bfb686f1fac1080a.tar.xz linux-dev-dd8d5b8c5b22e31079b259b8bfb686f1fac1080a.zip | |
ip_gre: fix error path when erspan_rcv failed
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")
Acked-by: William Tu <u9012063@gmail.com>
Cc: William Tu <u9012063@gmail.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index fd4d6e96da7e..5c36b6745dbc 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -434,11 +434,13 @@ static int gre_rcv(struct sk_buff *skb) tpi.proto == htons(ETH_P_ERSPAN2))) { 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); |