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

Commit eb8d7baa authored by Wilson Kok's avatar Wilson Kok Committed by David S. Miller
Browse files

bridge: skip fdb add if the port shouldn't learn 



Check in fdb_add_entry() if the source port should learn, similar
check is used in br_fdb_update.
Note that new fdb entries which are added manually or
as local ones are still permitted.
This patch has been tested by running traffic via a bridge port and
switching the port's state, also by manually adding/removing entries
from the bridge's fdb.

Signed-off-by: default avatarWilson Kok <wkok@cumulusnetworks.com>
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4969581

net/bridge/br_fdb.c

+6 −0
Original line number Diff line number Diff line
@@ -736,6 +736,12 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, 
	struct net_bridge_fdb_entry *fdb;

	bool modified = false;



	/* If the port cannot learn allow only local and static entries */

	if (!(state & NUD_PERMANENT) && !(state & NUD_NOARP) &&

	    !(source->state == BR_STATE_LEARNING ||

	      source->state == BR_STATE_FORWARDING))

		return -EPERM;



	fdb = fdb_find(head, addr, vid);

	if (fdb == NULL) {

		if (!(flags & NLM_F_CREATE))