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

Commit 8db1305d authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Greg Kroah-Hartman
Browse files

net: bridge: delete local fdb on device init failure 



[ Upstream commit d7bae09fa008c6c9a489580db0a5a12063b97f97 ]

On initialization failure we have to delete the local fdb which was
inserted due to the default pvid creation. This problem has been present
since the inception of default_pvid. Note that currently there are 2 cases:
1) in br_dev_init() when br_multicast_init() fails
2) if register_netdevice() fails after calling ndo_init()

This patch takes care of both since br_vlan_flush() is called on both
occasions. Also the new fdb delete would be a no-op on normal bridge
device destruction since the local fdb would've been already flushed by
br_dev_delete(). This is not an issue for ports since nbp_vlan_init() is
called last when adding a port thus nothing can fail after it.

Reported-by: default avatar <syzbot+88533dc8b582309bf3ee@syzkaller.appspotmail.com>
Fixes: 5be5a2df ("bridge: Add filtering support for default_pvid")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eee434d2

net/bridge/br_vlan.c

+5 −0
Original line number Diff line number Diff line
@@ -580,6 +580,11 @@ void br_vlan_flush(struct net_bridge *br) 


	ASSERT_RTNL();



	/* delete auto-added default pvid local fdb before flushing vlans

	 * otherwise it will be leaked on bridge device init failure

	 */

	br_fdb_delete_by_port(br, NULL, 0, 1);



	vg = br_vlan_group(br);

	__vlan_flush(vg);

	RCU_INIT_POINTER(br->vlgrp, NULL);