neighbour: fix neigh_master_filtered()
authorEric Dumazet <edumazet@google.com>
Sun, 21 Apr 2024 18:57:53 +0000 (18:57 +0000)
committerJakub Kicinski <kuba@kernel.org>
Wed, 24 Apr 2024 02:04:50 +0000 (19:04 -0700)
If we no longer hold RTNL, we must use netdev_master_upper_dev_get_rcu()
instead of netdev_master_upper_dev_get().

Fixes: ba0f78069423 ("neighbour: no longer hold RTNL in neigh_dump_info()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20240421185753.1808077-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/neighbour.c

index 0805c00c63d434589aeedaf8c40781b822d70b08..af270c202d9a96f64a409cb7f37f1d4620d948f8 100644 (file)
@@ -2682,7 +2682,7 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)
        if (!master_idx)
                return false;
 
-       master = dev ? netdev_master_upper_dev_get(dev) : NULL;
+       master = dev ? netdev_master_upper_dev_get_rcu(dev) : NULL;
 
        /* 0 is already used to denote NDA_MASTER wasn't passed, therefore need another
         * invalid value for ifindex to denote "no master".