diff options
| author | Sven Eckelmann <sven@narfation.org> | 2022-02-28 00:01:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-08 19:04:07 +0100 |
| commit | 130ec90cb3a20a6635fad5307a47f4c5155b74cc (patch) | |
| tree | 0d15e77757495443af19ed9021386c8225a4c437 | |
| parent | 86b66abce8ca4c47e7c972ec297a00417499edb4 (diff) | |
| download | linux-stable-130ec90cb3a20a6635fad5307a47f4c5155b74cc.tar.gz linux-stable-130ec90cb3a20a6635fad5307a47f4c5155b74cc.tar.bz2 linux-stable-130ec90cb3a20a6635fad5307a47f4c5155b74cc.zip | |
batman-adv: Request iflink once in batadv_get_real_netdevice
commit 6116ba09423f7d140f0460be6a1644dceaad00da 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: 5ed4a460a1d3 ("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>
| -rw-r--r-- | net/batman-adv/hard-interface.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 427be0f6586f..93d36c5189ab 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -228,14 +228,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; } @@ -245,9 +247,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) |