discover/network: Null terminate ifname buffer explicitly

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index 6ae44175ab134dd408f52060b20773b7e6884fbf..9594b2e48c6df4ce553d40007f1986da9945e7de 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -23,6 +23,7 @@
 #include "sysinfo.h"
 #include "platform.h"
 #include "device-handler.h"
+#include "paths.h"
 
 #define HWADDR_SIZE    6
 #define PIDFILE_BASE   (LOCAL_STATE_DIR "/petitboot/")
@@ -53,6 +54,7 @@ struct interface {
        struct list_item list;
        struct process *udhcpc_process;
        struct discover_device *dev;
+       bool ready;
 };
 
 struct network {
@@ -489,6 +491,8 @@ static void configure_interface(struct network *network,
 
        } else if (config->method == CONFIG_METHOD_STATIC) {
                configure_interface_static(network, interface, config);
+               /* Nothing left to do for static interfaces */
+               pending_network_jobs_start();
        }
 
        interface->state = IFSTATE_CONFIGURED;
@@ -497,12 +501,12 @@ static void configure_interface(struct network *network,
 static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 {
        bool have_ifaddr, have_ifname;
-       struct interface *interface;
+       struct interface *interface, *tmp;
        struct ifinfomsg *info;
        struct rtattr *attr;
        unsigned int mtu;
        uint8_t ifaddr[6];
-       char ifname[IFNAMSIZ+1];
+       char ifname[IFNAMSIZ];
        int attrlen, type;
 
 
@@ -530,6 +534,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 
                case IFLA_IFNAME:
                        strncpy(ifname, data, IFNAMSIZ);
+                       ifname[IFNAMSIZ - 1] = '\0';
                        have_ifname = true;
                        break;
 
@@ -561,7 +566,17 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
                interface->ifindex = info->ifi_index;
                interface->state = IFSTATE_NEW;
                memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr));
-               strncpy(interface->name, ifname, sizeof(interface->name) - 1);
+               strncpy(interface->name, ifname, sizeof(interface->name));
+
+               list_for_each_entry(&network->interfaces, tmp, list)
+                       if (memcmp(interface->hwaddr, tmp->hwaddr,
+                                  sizeof(interface->hwaddr)) == 0) {
+                               pb_log("%s: %s has duplicate MAC address, ignoring\n",
+                                      __func__, interface->name);
+                               talloc_free(interface);
+                               return -1;
+                       }
+
                list_add(&network->interfaces, &interface->list);
                create_interface_dev(network, interface);
        }
@@ -569,7 +584,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
        /* A repeated RTM_NEWLINK can represent an interface name change */
        if (strncmp(interface->name, ifname, IFNAMSIZ)) {
                pb_debug("ifname update: %s -> %s\n", interface->name, ifname);
-               strncpy(interface->name, ifname, sizeof(interface->name) - 1);
+               strncpy(interface->name, ifname, sizeof(interface->name));
                talloc_free(interface->dev->device->id);
                interface->dev->device->id =
                        talloc_strdup(interface->dev->device, ifname);
@@ -585,6 +600,11 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
        if (!interface->dev)
                create_interface_dev(network, interface);
 
+       if (!interface->ready && strncmp(interface->name, "lo", strlen("lo"))) {
+               pb_log("%s not marked ready yet\n", interface->name);
+               return 0;
+       }
+
        configure_interface(network, interface,
                        info->ifi_flags & IFF_UP,
                        info->ifi_flags & IFF_LOWER_UP);
@@ -592,6 +612,72 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
        return 0;
 }
 
+void network_mark_interface_ready(struct device_handler *handler,
+               int ifindex, const char *ifname, uint8_t *mac, int hwsize)
+{
+       struct network *network = device_handler_get_network(handler);
+       struct interface *interface, *tmp = NULL;
+       char *macstr;
+
+       if (!network) {
+               pb_log("Network not ready - can not mark interface ready\n");
+               return;
+       }
+
+       if (hwsize != HWADDR_SIZE)
+               return;
+
+       if (strncmp(ifname, "lo", strlen("lo")) == 0)
+               return;
+
+       interface = find_interface_by_ifindex(network, ifindex);
+       if (!interface) {
+               pb_debug("Creating ready interface %d - %s\n",
+                               ifindex, ifname);
+               interface = talloc_zero(network, struct interface);
+               interface->ifindex = ifindex;
+               interface->state = IFSTATE_NEW;
+               memcpy(interface->hwaddr, mac, HWADDR_SIZE);
+               strncpy(interface->name, ifname, sizeof(interface->name) - 1);
+
+               list_for_each_entry(&network->interfaces, tmp, list)
+                       if (memcmp(interface->hwaddr, tmp->hwaddr,
+                                  sizeof(interface->hwaddr)) == 0) {
+                               pb_log("%s: %s has duplicate MAC address, ignoring\n",
+                                      __func__, interface->name);
+                               talloc_free(interface);
+                               return;
+                       }
+
+               list_add(&network->interfaces, &interface->list);
+               create_interface_dev(network, interface);
+       }
+
+       if (interface->ready) {
+               pb_log("%s already ready\n", interface->name);
+               return;
+       }
+
+       if (strncmp(interface->name, ifname, strlen(ifname)) != 0) {
+               pb_debug("ifname update from udev: %s -> %s\n", interface->name, ifname);
+               strncpy(interface->name, ifname, sizeof(interface->name) - 1);
+               talloc_free(interface->dev->device->id);
+               interface->dev->device->id =
+                       talloc_strdup(interface->dev->device, ifname);
+       }
+
+       if (memcmp(interface->hwaddr, mac, HWADDR_SIZE) != 0) {
+               macstr = mac_bytes_to_string(interface, mac, hwsize);
+               pb_log("Warning - new MAC for interface %d does not match: %s\n",
+                               ifindex, macstr);
+               talloc_free(macstr);
+       }
+
+       pb_log("Interface %s ready\n", ifname);
+       interface->ready = true;
+       configure_interface(network, interface, false, false);
+}
+
 static int network_netlink_process(void *arg)
 {
        struct network *network = arg;