netifd: Mark interface as dynamic after it has been added in the interface list
authorHans Dedecker <dedeckeh@gmail.com>
Thu, 24 Apr 2014 07:51:15 +0000 (07:51 +0000)
committerSteven Barth <steven@midlink.org>
Thu, 24 Apr 2014 09:13:26 +0000 (11:13 +0200)
Adding an interface in the interface list in case of a config update will override the node version of the old interface and thus overriding the dynamic interface marker.
In case of config update interface_set_dynamic is done on an invalid interface pointer as the new interface pointer has been freed.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
ubus.c

diff --git a/ubus.c b/ubus.c
index aeb864fdabd24610c2f5a8c18351147c1fc1b69d..02becf22c8a37b894fba22aad87488f64c036845 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -147,13 +147,16 @@ netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
                goto error;
 
        interface_add(iface, config);
-       interface_set_dynamic(iface);
 
-       // need to look up the interface name again, in case of config update,
+       // need to look up the interface name again, in case of config update
+       // the pointer will have changed
        iface = vlist_find(&interfaces, name, iface, node);
        if (!iface)
                return UBUS_STATUS_UNKNOWN_ERROR;
 
+       // Set interface as dynamic
+       interface_set_dynamic(iface);
+
        dev = iface->main_dev.dev;
        if (!dev || !dev->default_config)
                return UBUS_STATUS_UNKNOWN_ERROR;