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

Commit 9cd6c84e authored by Haishuang Yan's avatar Haishuang Yan Committed by Greg Kroah-Hartman
Browse files

ip_gre: fix error path when erspan_rcv failed 




[ Upstream commit dd8d5b8c5b22e31079b259b8bfb686f1fac1080a ]

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: 84e54fe0 ("gre: introduce native tunnel support for ERSPAN")
Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
Cc: William Tu <u9012063@gmail.com>
Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6cfc525

net/ipv4/ip_gre.c

+2 −0
Original line number Diff line number Diff line
@@ -408,11 +408,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);