Author: kp
Date: Fri Mar 15 11:21:20 2019
New Revision: 345178
URL: https://svnweb.freebsd.org/changeset/base/345178
Log:
bridge: Fix panic if the STP root is removed
If the spanning tree root interface is removed from the bridge we panic
on the next 'ifconfig'.
While the STP code is notified whenever a bridge member interface is
removed from the bridge it does not clear the bs_root_port. This means
bs_root_port can still point at an bridge_iflist which has been free()d.
The next access to it will panic.
Explicitly check if the interface we're removing in bstp_destroy() is
the root, and if so re-assign the roles, which clears bs_root_port.
Reviewed by: philip
MFC after: 2 weeks
Modified:
head/sys/net/bridgestp.c
Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c Fri Mar 15 11:08:44 2019 (r345177)
+++ head/sys/net/bridgestp.c Fri Mar 15 11:21:20 2019 (r345178)
@@ -2274,4 +2274,7 @@ bstp_destroy(struct bstp_port *bp)
taskqueue_drain(taskqueue_swi, &bp->bp_statetask);
taskqueue_drain(taskqueue_swi, &bp->bp_rtagetask);
taskqueue_drain(taskqueue_swi, &bp->bp_mediatask);
+
+ if (bp->bp_bs->bs_root_port == bp)
+ bstp_assign_roles(bp->bp_bs);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
