| Message ID | 1536589188-27550-2-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2] erspan: return PACKET_REJECT when the appropriate tunnel is not found | expand |
On Mon, Sep 10, 2018 at 7:20 AM Haishuang Yan <yanhaishuang@cmss.chinamobile.com> wrote: > > When processing icmp unreachable message for erspan tunnel, tunnel id > should be erspan_net_id instead of ipgre_net_id. > > Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") > Cc: William Tu <u9012063@gmail.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > --- Thanks for the fix. Acked-by: William Tu <u9012063@gmail.com>
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Date: Mon, 10 Sep 2018 22:19:48 +0800 > When processing icmp unreachable message for erspan tunnel, tunnel id > should be erspan_net_id instead of ipgre_net_id. > > Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") > Cc: William Tu <u9012063@gmail.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Applied and queued up for -stable.
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 85a714d..8cce0e9 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -178,6 +178,9 @@ static void ipgre_err(struct sk_buff *skb, u32 info, if (tpi->proto == htons(ETH_P_TEB)) itn = net_generic(net, gre_tap_net_id); + else if (tpi->proto == htons(ETH_P_ERSPAN) || + tpi->proto == htons(ETH_P_ERSPAN2)) + itn = net_generic(net, erspan_net_id); else itn = net_generic(net, ipgre_net_id);
When processing icmp unreachable message for erspan tunnel, tunnel id should be erspan_net_id instead of ipgre_net_id. Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") Cc: William Tu <u9012063@gmail.com> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> --- net/ipv4/ip_gre.c | 3 +++ 1 file changed, 3 insertions(+)