wireless: fix use-after-free bug

[project/netifd.git] / device.h

diff --git a/device.h b/device.h
index 1f852ab..dbcaf77 100644 (file)
--- a/device.h
+++ b/device.h
@@ -15,6 +15,7 @@
 #define __LL_H
 
 #include <libubox/avl.h>
+#include <libubox/safe_list.h>
 #include <netinet/in.h>
 
 struct device;
@@ -44,7 +45,7 @@ struct device_type {
        struct list_head list;
        const char *name;
 
-       const struct config_param_list *config_params;
+       const struct uci_blob_param_list *config_params;
 
        struct device *(*create)(const char *name, struct blob_attr *attr);
        void (*config_init)(struct device *);
@@ -83,7 +84,7 @@ enum device_event {
  * device dependency with callbacks
  */
 struct device_user {
-       struct list_head list;
+       struct safe_list list;
 
        bool claimed;
        bool hotplug;
@@ -102,7 +103,7 @@ struct device_settings {
        uint8_t macaddr[6];
 };
 
-/* 
+/*
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
  */
@@ -110,8 +111,8 @@ struct device {
        const struct device_type *type;
 
        struct avl_node avl;
-       struct list_head users;
-       struct list_head aliases;
+       struct safe_list users;
+       struct safe_list aliases;
 
        char ifname[IFNAMSIZ + 1];
        int ifindex;
@@ -147,10 +148,11 @@ struct device_hotplug_ops {
        int (*del)(struct device *main, struct device *member);
 };
 
-extern const struct config_param_list device_attr_list;
+extern const struct uci_blob_param_list device_attr_list;
 extern const struct device_type simple_device_type;
 extern const struct device_type bridge_device_type;
 extern const struct device_type tunnel_device_type;
+extern const struct device_type macvlan_device_type;
 
 void device_lock(void);
 void device_unlock(void);