Skip to content

Commit

Permalink
batman-adv: Request iflink once in batadv_get_real_netdevice
Browse files Browse the repository at this point in the history
commit 6116ba0 upstream.

There is no need to call dev_get_iflink multiple times for the same
net_device in batadv_get_real_netdevice. And since some of the
ndo_get_iflink callbacks are dynamic (for example via RCUs like in
vxcan_get_iflink), it could easily happen that the returned values are not
stable. The pre-checks before __dev_get_by_index are then of course bogus.

Fixes: 5ed4a46 ("batman-adv: additional checks for virtual interfaces on top of WiFi")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
ecsv authored and gregkh committed Mar 8, 2022
1 parent dcf10d7 commit 3dae11d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions net/batman-adv/hard-interface.c
Expand Up @@ -217,14 +217,16 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev)
struct net_device *real_netdev = NULL;
struct net *real_net;
struct net *net;
int ifindex;
int iflink;

ASSERT_RTNL();

if (!netdev)
return NULL;

if (netdev->ifindex == dev_get_iflink(netdev)) {
iflink = dev_get_iflink(netdev);

if (netdev->ifindex == iflink) {
dev_hold(netdev);
return netdev;
}
Expand All @@ -234,9 +236,8 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev)
goto out;

net = dev_net(hard_iface->soft_iface);
ifindex = dev_get_iflink(netdev);
real_net = batadv_getlink_net(netdev, net);
real_netdev = dev_get_by_index(real_net, ifindex);
real_netdev = dev_get_by_index(real_net, iflink);

out:
if (hard_iface)
Expand Down

0 comments on commit 3dae11d

Please sign in to comment.