Commit 47fab41a authored Jul 30, 2014 by Toshiaki Makita Committed by David S. Miller Jul 31, 2014

bridge: Don't include NDA_VLAN for FDB entries with vid 0



An FDB entry with vlan_id 0 doesn't mean it is used in vlan 0, but used when
vlan_filtering is disabled.

There is inconsistency around NDA_VLAN whose payload is 0 - even if we add
an entry by RTM_NEWNEIGH without any NDA_VLAN, and even though adding an
entry with NDA_VLAN 0 is prohibited, we get an entry with NDA_VLAN 0 by
RTM_GETNEIGH.

Dumping an FDB entry with vlan_id 0 shouldn't include NDA_VLAN.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7afcaec4

net/bridge/br_fdb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -631,7 +631,7 @@ static int fdb_fill_info(struct sk_buff skb, const struct net_bridge br,
		if (nla_put(skb, NDA_CACHEINFO, sizeof(ci), &ci))
		goto nla_put_failure;

		if (nla_put(skb, NDA_VLAN, sizeof(u16), &fdb->vlan_id))
		if (fdb->vlan_id && nla_put(skb, NDA_VLAN, sizeof(u16), &fdb->vlan_id))
		goto nla_put_failure;

		return nlmsg_end(skb, nlh);

Admin message