redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

erspan: fix error handling for erspan tunnel 

[ Upstream commit 51dc63e391 ]

When processing icmp unreachable message for erspan tunnel, tunnel id
should be erspan_net_id instead of ipgre_net_id.

Fixes: 84e54fe0a5 ("gre: introduce native tunnel support for ERSPAN")
Cc: William Tu <u9012063@gmail.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
Haishuang Yan 2018-09-10 22:19:48 +08:00 committed by Greg Kroah-Hartman
parent 04f625fc5a
commit 456191a855
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/ip_gre.c
View File

@ -177,6 +177,8 @@ 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))
itn = net_generic(net, erspan_net_id);
else
itn = net_generic(net, ipgre_net_id);