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

Commit dd8d5b8c authored by Haishuang Yan's avatar Haishuang Yan Committed by David S. Miller
Browse files

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: 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>
parent 293a1991

net/ipv4/ip_gre.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -434,11 +434,13 @@ static int gre_rcv(struct sk_buff *skb) 
		     tpi.proto == htons(ETH_P_ERSPAN2))) {

		     tpi.proto == htons(ETH_P_ERSPAN2))) {

		if (erspan_rcv(skb, &tpi, hdr_len) == PACKET_RCVD)

		if (erspan_rcv(skb, &tpi, hdr_len) == PACKET_RCVD)

			return 0;

			return 0;

		goto out;

	}

	}





	if (ipgre_rcv(skb, &tpi, hdr_len) == PACKET_RCVD)

	if (ipgre_rcv(skb, &tpi, hdr_len) == PACKET_RCVD)

		return 0;

		return 0;





out:

	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);

	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);

drop:

drop:

	kfree_skb(skb);

	kfree_skb(skb);