fix use-after-free when an interface event is pending while the interface is being...

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index c5addea..0aa5c5a 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -242,6 +242,7 @@ interface_cleanup(struct interface *iface, bool reload)
        list_for_each_entry_safe(dep, tmp, &iface->users, list)
                interface_remove_user(dep);
 
+       interface_dequeue_event(iface);
        interface_ip_flush(&iface->config_ip);
        interface_flush_state(iface);
        interface_clear_errors(iface);
@@ -420,10 +421,10 @@ interface_set_main_dev(struct interface *iface, struct device *dev)
        if (iface->main_dev.dev == dev)
                return;
 
-       device_add_user(&iface->main_dev, dev);
        if (set_l3)
                interface_set_l3_dev(iface, dev);
 
+       device_add_user(&iface->main_dev, dev);
        if (claimed)
                device_claim(&iface->l3_dev);