Skip to content

Commit 6c1f41a

Browse files
ecsvsimonwunderlich
authored andcommitted
batman-adv: Don't expect inter-netns unique iflink indices
The ifindex doesn't have to be unique for multiple network namespaces on the same machine. $ ip netns add test1 $ ip -net test1 link add dummy1 type dummy $ ip netns add test2 $ ip -net test2 link add dummy2 type dummy $ ip -net test1 link show dev dummy1 6: dummy1: <BROADCAST,NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 link/ether 96:81:55:1e:dd:85 brd ff:ff:ff:ff:ff:ff $ ip -net test2 link show dev dummy2 6: dummy2: <BROADCAST,NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 link/ether 5a:3c:af:35:07:c3 brd ff:ff:ff:ff:ff:ff But the batman-adv code to walk through the various layers of virtual interfaces uses this assumption because dev_get_iflink handles it internally and doesn't return the actual netns of the iflink. And dev_get_iflink only documents the situation where ifindex == iflink for physical devices. But only checking for dev->netdev_ops->ndo_get_iflink is also not an option because ipoib_get_iflink implements it even when it sometimes returns an iflink != ifindex and sometimes iflink == ifindex. The caller must therefore make sure itself to check both netns and iflink + ifindex for equality. Only when they are equal, a "physical" interface was detected which should stop the traversal. On the other hand, vxcan_get_iflink can also return 0 in case there was currently no valid peer. In this case, it is still necessary to stop. Fixes: b7eddd0 ("batman-adv: prevent using any virtual device created on batman-adv as hard-interface") Fixes: 5ed4a46 ("batman-adv: additional checks for virtual interfaces on top of WiFi") Reported-by: Sabrina Dubroca <sd@queasysnail.net> Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
1 parent 6116ba0 commit 6c1f41a

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

net/batman-adv/hard-interface.c

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,15 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev)
157157
return true;
158158

159159
iflink = dev_get_iflink(net_dev);
160-
161-
/* no more parents..stop recursion */
162-
if (iflink == 0 || iflink == net_dev->ifindex)
160+
if (iflink == 0)
163161
return false;
164162

165163
parent_net = batadv_getlink_net(net_dev, net);
166164

165+
/* iflink to itself, most likely physical device */
166+
if (net == parent_net && iflink == net_dev->ifindex)
167+
return false;
168+
167169
/* recurse over the parent device */
168170
parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);
169171
/* if we got a NULL parent_dev there is something broken.. */
@@ -223,8 +225,7 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev)
223225
return NULL;
224226

225227
iflink = dev_get_iflink(netdev);
226-
227-
if (netdev->ifindex == iflink) {
228+
if (iflink == 0) {
228229
dev_hold(netdev);
229230
return netdev;
230231
}
@@ -235,6 +236,14 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev)
235236

236237
net = dev_net(hard_iface->soft_iface);
237238
real_net = batadv_getlink_net(netdev, net);
239+
240+
/* iflink to itself, most likely physical device */
241+
if (net == real_net && netdev->ifindex == iflink) {
242+
real_netdev = netdev;
243+
dev_hold(real_netdev);
244+
goto out;
245+
}
246+
238247
real_netdev = dev_get_by_index(real_net, iflink);
239248

240249
out:

0 commit comments

Comments
 (0)