Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e5a82ef authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

bridge: Fix VLAN reference count problem 



When a VLAN is added on a port, a reference is taken on the
corresponding master VLAN entry. If it does not already exist, then it
is created and a reference taken.

However, in the second case a reference is not really taken when
CONFIG_REFCOUNT_FULL is enabled as refcount_inc() is replaced by
refcount_inc_not_zero().

Fix this by using refcount_set() on a newly created master VLAN entry.

Fixes: 25127759 ("net, bridge: convert net_bridge_vlan.refcnt from atomic_t to refcount_t")
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a291aa1

net/bridge/br_vlan.c

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ static struct net_bridge_vlan *br_vlan_get_master(struct net_bridge *br, u16 vid 
		masterv = br_vlan_find(vg, vid);

		if (WARN_ON(!masterv))

			return NULL;

		refcount_set(&masterv->refcnt, 1);

		return masterv;

	}

	refcount_inc(&masterv->refcnt);