Commit 0e5a82ef authored Feb 25, 2018 by Ido Schimmel Committed by David S. Miller Feb 26, 2018

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: Ido Schimmel <idosch@mellanox.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David 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);

Admin message