diff options
| author | Horatiu Vultur <horatiu.vultur@microchip.com> | 2020-05-21 23:19:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-22 16:17:15 -0700 |
| commit | 7aa38018be1fa4cff3e631f26bc821086ba90d29 (patch) | |
| tree | 74030ab0a9bb5b3da26d958f7f18adf32ec2cad8 /net/bridge | |
| parent | a74707396c9185cbbca0ae0a115b95b5a8b6bfa1 (diff) | |
| download | linux-riscv-7aa38018be1fa4cff3e631f26bc821086ba90d29.tar.gz linux-riscv-7aa38018be1fa4cff3e631f26bc821086ba90d29.tar.bz2 linux-riscv-7aa38018be1fa4cff3e631f26bc821086ba90d29.zip | |
bridge: mrp: Add br_mrp_unique_ifindex function
It is not allow to have the same net bridge port part of multiple MRP
rings. Therefore add a check if the port is used already in a different
MRP. In that case return failure.
Fixes: 9a9f26e8f7ea ("bridge: mrp: Connect MRP API with the switchdev API")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_mrp.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c index d7bc09de4c13..854e31bf0151 100644 --- a/net/bridge/br_mrp.c +++ b/net/bridge/br_mrp.c @@ -37,6 +37,26 @@ static struct br_mrp *br_mrp_find_id(struct net_bridge *br, u32 ring_id) return res; } +static bool br_mrp_unique_ifindex(struct net_bridge *br, u32 ifindex) +{ + struct br_mrp *mrp; + + list_for_each_entry_rcu(mrp, &br->mrp_list, list, + lockdep_rtnl_is_held()) { + struct net_bridge_port *p; + + p = rtnl_dereference(mrp->p_port); + if (p && p->dev->ifindex == ifindex) + return false; + + p = rtnl_dereference(mrp->s_port); + if (p && p->dev->ifindex == ifindex) + return false; + } + + return true; +} + static struct br_mrp *br_mrp_find_port(struct net_bridge *br, struct net_bridge_port *p) { @@ -255,6 +275,11 @@ int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance) !br_mrp_get_port(br, instance->s_ifindex)) return -EINVAL; + /* It is not possible to have the same port part of multiple rings */ + if (!br_mrp_unique_ifindex(br, instance->p_ifindex) || + !br_mrp_unique_ifindex(br, instance->s_ifindex)) + return -EINVAL; + mrp = kzalloc(sizeof(*mrp), GFP_KERNEL); if (!mrp) return -ENOMEM; |