From: Samuel Mendoza-Jonas Date: Thu, 12 Jan 2017 00:12:42 +0000 (+1100) Subject: discover/network: Ignore interfaces with pre-existing MAC address X-Git-Tag: v1.4.1~3 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=58b86dca9e65824e8fd25df58794a88ac31ab01f;hp=0e2792afaf5a2d576ed12b965468069819057c07;ds=sidebyside discover/network: Ignore interfaces with pre-existing MAC address Petitboot uses the MAC address of network interfaces as a unique identifier. This can cause a crash in pb-discover on a machine that has multiple interfaces with the same MAC address. While duplicate MAC addresses are rare and imply an issue with the larger system configuration Petitboot should handle this gracefully, so log a warning and ignore any interfaces other than the first to appear that share a MAC address. Signed-off-by: Samuel Mendoza-Jonas --- diff --git a/discover/network.c b/discover/network.c index 6ae4417..8ca4561 100644 --- a/discover/network.c +++ b/discover/network.c @@ -497,7 +497,7 @@ 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; @@ -562,6 +562,16 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) interface->state = IFSTATE_NEW; memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr)); 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 -1; + } + list_add(&network->interfaces, &interface->list); create_interface_dev(network, interface); }