wireless: fix use-after-free bug

[project/netifd.git] / device.h

diff --git a/device.h b/device.h
index 108d383..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 *);
@@ -75,16 +76,21 @@ enum device_event {
 
        DEV_EVENT_LINK_UP,
        DEV_EVENT_LINK_DOWN,
+
+       __DEV_EVENT_MAX
 };
 
 /*
  * device dependency with callbacks
  */
 struct device_user {
-       struct list_head list;
+       struct safe_list list;
 
        bool claimed;
        bool hotplug;
+       bool alias;
+
+       uint8_t ev_idx[__DEV_EVENT_MAX];
 
        struct device *dev;
        void (*cb)(struct device_user *, enum device_event);
@@ -97,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
  */
@@ -105,7 +111,8 @@ struct device {
        const struct device_type *type;
 
        struct avl_node avl;
-       struct list_head users;
+       struct safe_list users;
+       struct safe_list aliases;
 
        char ifname[IFNAMSIZ + 1];
        int ifindex;
@@ -141,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);
@@ -181,6 +189,7 @@ void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);
 void alias_notify_device(const char *name, struct device *dev);
+struct device *device_alias_get(const char *name);
 
 static inline void
 device_set_deferred(struct device *dev, bool value)