ubus: check the l3_dev pointer before dereferencing it

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index b81136b..aeb864f 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -650,7 +650,8 @@ netifd_dump_status(struct interface *iface)
        if (iface->state == IFS_UP) {
                time_t cur = system_get_rtime();
                blobmsg_add_u32(&b, "uptime", cur - iface->start_time);
-               blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
+               if (iface->l3_dev.dev)
+                       blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
        }
 
        if (iface->proto_handler)
@@ -737,11 +738,11 @@ netifd_dump_status(struct interface *iface)
 
        a = blobmsg_open_table(&b, "data");
        avl_for_each_element(&iface->data, data, node)
-               blob_put(&b, blob_id(data->data), blob_data(data->data), blob_len(data->data));
+               blobmsg_add_blob(&b, data->data);
 
        blobmsg_close_table(&b, a);
 
-       if (!list_is_empty(&iface->errors))
+       if (!list_empty(&iface->errors))
                netifd_add_interface_errors(&b, iface);
 }