p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipvlan: read direct ifindex instead of iflink 

In the ipv4 outbound path of an ipvlan device in l3 mode, the ifindex is
being grabbed from dev_get_iflink. This works for the physical device
case, since as the documentation of that function notes: "Physical
interfaces have the same 'ifindex' and 'iflink' values.".  However, if
the master device is a veth, and the pairs are in separate net
namespaces, the route lookup will fail with -ENODEV due to outer veth
pair being in a separate namespace from the ipvlan master/routing
namespace.

  ns0    |   ns1    |   ns2
 veth0a--|--veth0b--|--ipvl0

In ipvlan_process_v4_outbound(), a packet sent from ipvl0 in the above
configuration will pass fl.flowi4_oif == veth0a to
ip_route_output_flow(), but *net == ns1.

Notice also that ipv6 processing is not using iflink. Since there is a
discrepancy in usage, fixup both v4 and v6 case to use local dev
variable.

Tested this with l3 ipvlan on top of veth, as well as with single
physical interface in the top namespace.

Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>
Reviewed-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Brenden Blanco 2015-10-20 16:47:33 -07:00 committed by David S. Miller
parent dbf650b67b
commit 63b11e757d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ipvlan/ipvlan_core.c
View File

@ -348,7 +348,7 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb)
struct rtable *rt; struct rtable *rt;
int err, ret = NET_XMIT_DROP; int err, ret = NET_XMIT_DROP;
struct flowi4 fl4 = { struct flowi4 fl4 = {
.flowi4_oif = dev_get_iflink(dev), .flowi4_oif = dev->ifindex,
.flowi4_tos = RT_TOS(ip4h->tos), .flowi4_tos = RT_TOS(ip4h->tos),
.flowi4_flags = FLOWI_FLAG_ANYSRC, .flowi4_flags = FLOWI_FLAG_ANYSRC,
.daddr = ip4h->daddr, .daddr = ip4h->daddr,
@ -386,7 +386,7 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)
struct dst_entry *dst; struct dst_entry *dst;
int err, ret = NET_XMIT_DROP; int err, ret = NET_XMIT_DROP;
struct flowi6 fl6 = { struct flowi6 fl6 = {
.flowi6_iif = skb->dev->ifindex, .flowi6_iif = dev->ifindex,
.daddr = ip6h->daddr, .daddr = ip6h->daddr,
.saddr = ip6h->saddr, .saddr = ip6h->saddr,
.flowi6_flags = FLOWI_FLAG_ANYSRC, .flowi6_flags = FLOWI_FLAG_ANYSRC,