From: Hans Dedecker Date: Thu, 24 Apr 2014 07:51:15 +0000 (+0000) Subject: netifd: Mark interface as dynamic after it has been added in the interface list X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=372fa0f3f867eee4b949727aa5c2e4fa9e728d55 netifd: Mark interface as dynamic after it has been added in the interface list 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 --- diff --git a/ubus.c b/ubus.c index aeb864f..02becf2 100644 --- 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;