report erspan version field just for erspan tunnels
Subsystems (3)
cover report erspan version field just for erspan tunnels
Do not report erspan_version to userpsace for non erspan tunnels. Report IFLA_GRE_ERSPAN_INDEX only for erspan version 1 in ip6gre_fill_info
Lorenzo Bianconi (2):
net: ip_gre: do not report erspan_ver for gre or gretap
net: ip6_gre: do not report erspan_ver for ip6gre or ip6gretap
net/ipv4/ip_gre.c | 33 +++++++++++++++++---------------- net/ipv6/ip6_gre.c | 36 ++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 34 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 net: ip_gre: do not report erspan_ver for gre or gretap
Report erspan version field to userspace in ipgre_fill_info just for erspan tunnels. The issue can be triggered with the following reproducer:
$ip link add name gre1 type gre local 192.168.0.1 remote 192.168.1.1
$ip link set dev gre1 up
$ip -d link sh gre1
13: gre1@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1476 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
link/gre 192.168.0.1 peer 192.168.1.1 promiscuity 0 minmtu 0 maxmtu 0
gre remote 192.168.1.1 local 192.168.0.1 ttl inherit erspan_ver 0 addrgenmode eui64 numtxqueues 1 numrxqueues 1--- net/ipv4/ip_gre.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
net/ipv4/ip_gre.c +17 -16
@@ -1457,9 +1457,23 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev)struct ip_tunnel_parm *p = &t->parms;__be16 o_flags = p->o_flags; -if ((t->erspan_ver ==1 || t->erspan_ver ==2 ) && - !t->collect_md) - o_flags |=TUNNEL_KEY ; +if (t->erspan_ver ==1 || t->erspan_ver ==2 ) { +if (!t->collect_md) + o_flags |=TUNNEL_KEY ; + +if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_VER , t->erspan_ver)) + goto nla_put_failure; + +if (t->erspan_ver ==1 ) { +if (nla_put_u32 (skb,IFLA_GRE_ERSPAN_INDEX , t->index)) + goto nla_put_failure; + }else { +if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_DIR , t->dir)) + goto nla_put_failure; +if (nla_put_u16 (skb,IFLA_GRE_ERSPAN_HWID , t->hwid)) + goto nla_put_failure; + } + }if (nla_put_u32 (skb,IFLA_GRE_LINK , p->link) || nla_put_be16(skb, IFLA_GRE_IFLAGS,
@@ -1495,19 +1509,6 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) goto nla_put_failure; } -if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_VER , t->erspan_ver)) - goto nla_put_failure; - -if (t->erspan_ver ==1 ) { -if (nla_put_u32 (skb,IFLA_GRE_ERSPAN_INDEX , t->index)) - goto nla_put_failure; - }else if (t->erspan_ver ==2 ) { -if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_DIR , t->dir)) - goto nla_put_failure; -if (nla_put_u16 (skb,IFLA_GRE_ERSPAN_HWID , t->hwid)) - goto nla_put_failure; - } -return 0 ; nla_put_failure:
Signature · 1 line
2.20.1
PATCH 2/2 net: ip6_gre: do not report erspan_ver for ip6gre or ip6gretap
In reply to Lorenzo BianconiReport erspan version field to userspace in ip6gre_fill_info just for erspan_v6 tunnels. Moreover report IFLA_GRE_ERSPAN_INDEX only for erspan version 1.
The issue can be triggered with the following reproducer:
$ip link add name gre6 type ip6gre local 2001::1 remote 2002::2
$ip link set gre6 up
$ip -d link sh gre6
14: grep6@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1448 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
link/gre6 2001::1 peer 2002::2 promiscuity 0 minmtu 0 maxmtu 0
ip6gre remote 2002::2 local 2001::1 hoplimit 64 encaplimit 4 tclass 0x00 flowlabel 0x00000 erspan_index 0 erspan_ver 0 addrgenmode eui64--- net/ipv6/ip6_gre.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
net/ipv6/ip6_gre.c +18 -18
@@ -2104,9 +2104,23 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev)struct __ip6_tnl_parm *p = &t->parms;__be16 o_flags = p->o_flags; -if ((p->erspan_ver ==1 || p->erspan_ver ==2 ) && - !p->collect_md) - o_flags |=TUNNEL_KEY ; +if (p->erspan_ver ==1 || p->erspan_ver ==2 ) { +if (!p->collect_md) + o_flags |=TUNNEL_KEY ; + +if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_VER , p->erspan_ver)) + goto nla_put_failure; + +if (p->erspan_ver ==1 ) { +if (nla_put_u32 (skb,IFLA_GRE_ERSPAN_INDEX , p->index)) + goto nla_put_failure; + }else { +if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_DIR , p->dir)) + goto nla_put_failure; +if (nla_put_u16 (skb,IFLA_GRE_ERSPAN_HWID , p->hwid)) + goto nla_put_failure; + } + }if (nla_put_u32 (skb,IFLA_GRE_LINK , p->link) || nla_put_be16(skb, IFLA_GRE_IFLAGS,
@@ -2121,8 +2135,7 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev)nla_put_u8 (skb,IFLA_GRE_ENCAP_LIMIT , p->encap_limit) ||nla_put_be32 (skb,IFLA_GRE_FLOWINFO , p->flowinfo) ||nla_put_u32 (skb,IFLA_GRE_FLAGS , p->flags) || -nla_put_u32 (skb,IFLA_GRE_FWMARK , p->fwmark) || - nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p->index)) + nla_put_u32(skb, IFLA_GRE_FWMARK, p->fwmark)) goto nla_put_failure; if (nla_put_u16(skb, IFLA_GRE_ENCAP_TYPE,
@@ -2140,19 +2153,6 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) goto nla_put_failure; } -if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_VER , p->erspan_ver)) - goto nla_put_failure; - -if (p->erspan_ver ==1 ) { -if (nla_put_u32 (skb,IFLA_GRE_ERSPAN_INDEX , p->index)) - goto nla_put_failure; - }else if (p->erspan_ver ==2 ) { -if (nla_put_u8 (skb,IFLA_GRE_ERSPAN_DIR , p->dir)) - goto nla_put_failure; -if (nla_put_u16 (skb,IFLA_GRE_ERSPAN_HWID , p->hwid)) - goto nla_put_failure; - } -return 0 ; nla_put_failure:
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Lorenzo Bianconi <[email protected]>
Date: Tue, 19 Feb 2019 17:42:04 +0100
Quoted 3 lines
Do not report
erspan_versionto userpsace for non erspan tunnels. ReportIFLA_GRE_ERSPAN_INDEXonly for erspan version 1 inip6gre_fill_info
Series applied, thanks.