Commit 873aca2e authored by Petr Machata's avatar Petr Machata Committed by David S. Miller

net: bridge: Fix locking in br_fdb_find_port()

Callers of br_fdb_find() need to hold the hash lock, which
br_fdb_find_port() doesn't do. However, since br_fdb_find_port() is not
doing any actual FDB manipulation, the hash lock is not really needed at
all. So convert to br_fdb_find_rcu(), surrounded by rcu_read_lock() /
_unlock() pair.

The device pointer copied from inside the FDB entry is then kept alive
by the RTNL lock, which br_fdb_find_port() asserts.

Fixes: 4d4fd361 ("net: bridge: Publish bridge accessor functions")
Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c206b20
...@@ -135,9 +135,11 @@ struct net_device *br_fdb_find_port(const struct net_device *br_dev, ...@@ -135,9 +135,11 @@ struct net_device *br_fdb_find_port(const struct net_device *br_dev,
return NULL; return NULL;
br = netdev_priv(br_dev); br = netdev_priv(br_dev);
f = br_fdb_find(br, addr, vid); rcu_read_lock();
f = br_fdb_find_rcu(br, addr, vid);
if (f && f->dst) if (f && f->dst)
dev = f->dst->dev; dev = f->dst->dev;
rcu_read_unlock();
return dev; return dev;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment