Commit 7aa38018 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

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: 9a9f26e8 ("bridge: mrp: Connect MRP API with the switchdev API")
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7470739

net/bridge/br_mrp.c

+25 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE