Patch "ip_gre: fix error path when erspan_rcv failed" has been added to the 4.14-stable tree

This is a note to let you know that I've just added the patch titled

ip_gre: fix error path when erspan_rcv failed

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ip_gre-fix-error-path-when-erspan_rcv-failed.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Haishuang Yan <[email protected]>
Date: Wed, 20 Dec 2017 10:21:46 +0800
Subject: ip_gre: fix error path when erspan_rcv failed

From: Haishuang Yan <[email protected]>

[ 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.

---
 net/ipv4/ip_gre.c |    2 ++
 1 file changed, 2 insertions(+)

@@ -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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/ip_gre-fix-error-path-when-erspan_rcv-failed.patch queue-4.14/ip_gre-fix-potential-memory-leak-in-erspan_rcv.patch