| Message ID | 20240421185753.1808077-1-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1c04b46cbdddc7882eeb671521035ea884245b9f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] neighbour: fix neigh_master_filtered() | expand |
Sun, Apr 21, 2024 at 08:57:53PM CEST, edumazet@google.com wrote: >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>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Sun, 21 Apr 2024 18:57:53 +0000 you wrote: > 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> > --- > net/core/neighbour.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [net-next] neighbour: fix neigh_master_filtered() https://git.kernel.org/netdev/net-next/c/1c04b46cbddd You are awesome, thank you!
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 0805c00c63d434589aeedaf8c40781b822d70b08..af270c202d9a96f64a409cb7f37f1d4620d948f8 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -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".
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> --- net/core/neighbour.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)