rstp: Properly disable an RSTP port before deleting it.

RSTP may end up referencing stale memory if a port is removed without disabling it first. This patch, together with the previous patch by Daniele Venturino, was tested to resolve a crach by Daniel Swahn. Signed-off-by: Jarno Rajahalme <[email protected]> Tested-by: Daniel Swahn <[email protected]>
vdeore · Oct 12, 2015 · e73e916 · e73e916
1 parent c7e4f0b
commit e73e916
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
@@ -2543,8 +2543,11 @@ set_rstp_port(struct ofport *ofport_,
 
     if (!s || !s->enable) {
         if (rp) {
-            rstp_port_unref(rp);
+            rstp_port_set_aux(rp, NULL);
+            rstp_port_set_state(rp, RSTP_DISABLED);
+            rstp_port_set_mac_operational(rp, false);
             ofport->rstp_port = NULL;
+            rstp_port_unref(rp);
             update_rstp_port_state(ofport);
         }
         return;