Return-Path: Received: from mail-by2nam03on0124.outbound.protection.outlook.com ([104.47.42.124]:23374 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964947AbeCHE5z (ORCPT ); Wed, 7 Mar 2018 23:57:55 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Haishuang Yan , William Tu , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.15 64/78] ip_gre: fix error path when erspan_rcv failed Date: Thu, 8 Mar 2018 04:56:29 +0000 Message-ID: <20180308045525.7662-64-alexander.levin@microsoft.com> References: <20180308045525.7662-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045525.7662-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Haishuang Yan [ 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: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") Acked-by: William Tu Cc: William Tu Signed-off-by: Haishuang Yan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/ip_gre.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 45ffd3d045d2..e05bca0e61fc 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -408,11 +408,13 @@ static int gre_rcv(struct sk_buff *skb) if (unlikely(tpi.proto =3D=3D htons(ETH_P_ERSPAN))) { if (erspan_rcv(skb, &tpi, hdr_len) =3D=3D PACKET_RCVD) return 0; + goto out; } =20 if (ipgre_rcv(skb, &tpi, hdr_len) =3D=3D PACKET_RCVD) return 0; =20 +out: icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); drop: kfree_skb(skb); --=20 2.14.1