X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.c;h=b44aeaf6db0dd071e5beab0d3e0daade3031cb98;hp=726945816dc79580da31dfd04a3ea2a43eaec469;hb=04b67d49254d956d31bcfe80340fb9df7ed332d3;hpb=74df0fca09b3c31ed19e14ba80f996fdff772417 diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 726945816..b44aeaf6d 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -20,10 +20,11 @@ ***/ #include -#include +#include #include "sd-id128.h" +#include "missing.h" #include "link-config.h" #include "ethtool-util.h" @@ -38,7 +39,8 @@ #include "fileio.h" #include "hashmap.h" #include "rtnl-util.h" -#include "net-util.h" +#include "network-internal.h" +#include "siphash24.h" struct link_config_ctx { LIST_HEAD(link_config, links); @@ -49,10 +51,18 @@ struct link_config_ctx { sd_rtnl *rtnl; - char **link_dirs; usec_t link_dirs_ts_usec; }; +static const char* const link_dirs[] = { + "/etc/systemd/network", + "/run/systemd/network", + "/usr/lib/systemd/network", +#ifdef HAVE_SPLIT_USR + "/lib/systemd/network", +#endif + NULL}; + DEFINE_TRIVIAL_CLEANUP_FUNC(link_config_ctx*, link_config_ctx_free); #define _cleanup_link_config_ctx_free_ _cleanup_(link_config_ctx_freep) @@ -72,23 +82,6 @@ int link_config_ctx_new(link_config_ctx **ret) { ctx->enable_name_policy = true; - ctx->link_dirs = strv_new("/etc/systemd/network", - "/run/systemd/network", - "/usr/lib/systemd/network", -#ifdef HAVE_SPLIT_USR - "/lib/systemd/network", -#endif - NULL); - if (!ctx->link_dirs) { - log_error("failed to build link config directory array"); - return -ENOMEM; - } - - if (!path_strv_canonicalize_uniq(ctx->link_dirs)) { - log_error("failed to canonicalize link config directories\n"); - return -ENOMEM; - } - *ret = ctx; ctx = NULL; @@ -98,16 +91,23 @@ int link_config_ctx_new(link_config_ctx **ret) { static int link_config_ctx_connect(link_config_ctx *ctx) { int r; - if (ctx->ethtool_fd >= 0 && ctx->rtnl) - return 0; - - r = ethtool_connect(&ctx->ethtool_fd); - if (r < 0) - return r; + if (ctx->ethtool_fd == -1) { + r = ethtool_connect(&ctx->ethtool_fd); + if (r < 0) { + log_warning("link_config: could not connect to ethtool: %s", + strerror(-r)); + return r; + } + } - r = sd_rtnl_open(0, &ctx->rtnl); - if (r < 0) - return r; + if (!ctx->rtnl) { + r = sd_rtnl_open(&ctx->rtnl, 0); + if (r < 0) { + log_warning("link_config: could not connect to rtnl: %s", + strerror(-r)); + return r; + } + } return 0; } @@ -124,6 +124,8 @@ static void link_configs_free(link_config_ctx *ctx) { free(link->match_driver); free(link->match_type); free(link->description); + free(link->alias); + free(link->name_policy); free(link); } @@ -133,12 +135,10 @@ void link_config_ctx_free(link_config_ctx *ctx) { if (!ctx) return; - if (ctx->ethtool_fd >= 0) - close_nointr_nofail(ctx->ethtool_fd); + safe_close(ctx->ethtool_fd); sd_rtnl_unref(ctx->rtnl); - strv_free(ctx->link_dirs); link_configs_free(ctx); free(ctx); @@ -147,51 +147,54 @@ void link_config_ctx_free(link_config_ctx *ctx) { } static int load_link(link_config_ctx *ctx, const char *filename) { - link_config *link; - FILE *file; + _cleanup_free_ link_config *link = NULL; + _cleanup_fclose_ FILE *file = NULL; int r; + assert(ctx); + assert(filename); + file = fopen(filename, "re"); if (!file) { if (errno == ENOENT) return 0; else - return errno; + return -errno; } - link = new0(link_config, 1); - if (!link) { - r = log_oom(); - goto failure; + if (null_or_empty_fd(fileno(file))) { + log_debug("Skipping empty file: %s", filename); + return 0; } + link = new0(link_config, 1); + if (!link) + return log_oom(); + link->mac_policy = _MACPOLICY_INVALID; link->wol = _WOL_INVALID; link->duplex = _DUP_INVALID; - - r = config_parse(NULL, filename, file, "Match\0Link\0Ethernet\0", config_item_perf_lookup, - (void*) link_config_gperf_lookup, false, false, link); - if (r < 0) { - log_warning("Colud not parse config file %s: %s", filename, strerror(-r)); - goto failure; - } else + r = config_parse(NULL, filename, file, + "Match\0Link\0Ethernet\0", + config_item_perf_lookup, link_config_gperf_lookup, + false, false, true, link); + if (r < 0) + return r; + else log_debug("Parsed configuration file %s", filename); link->filename = strdup(filename); LIST_PREPEND(links, ctx->links, link); + link = NULL; return 0; - -failure: - free(link); - return r; } static bool enable_name_policy(void) { - _cleanup_free_ char *line; - char *w, *state; + _cleanup_free_ char *line = NULL; + const char *word, *state; int r; size_t l; @@ -201,8 +204,8 @@ static bool enable_name_policy(void) { if (r <= 0) return true; - FOREACH_WORD_QUOTED(w, l, line, state) - if (strneq(w, "net.ifnames=0", l)) + FOREACH_WORD_QUOTED(word, l, line, state) + if (strneq(word, "net.ifnames=0", l)) return false; return true; @@ -210,7 +213,8 @@ static bool enable_name_policy(void) { int link_config_load(link_config_ctx *ctx) { int r; - char **files, **f; + _cleanup_strv_free_ char **files; + char **f; link_configs_free(ctx); @@ -220,9 +224,9 @@ int link_config_load(link_config_ctx *ctx) { } /* update timestamp */ - paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, true); + paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, true); - r = conf_files_list_strv(&files, ".link", NULL, (const char **)ctx->link_dirs); + r = conf_files_list_strv(&files, ".link", NULL, link_dirs); if (r < 0) { log_error("failed to enumerate link files: %s", strerror(-r)); return r; @@ -238,7 +242,7 @@ int link_config_load(link_config_ctx *ctx) { } bool link_config_should_reload(link_config_ctx *ctx) { - return paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, false); + return paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, false); } int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_config **ret) { @@ -246,11 +250,13 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi LIST_FOREACH(links, link, ctx->links) { - if (net_match_config(link->match_mac, link->match_path, - link->match_driver, link->match_type, NULL, - udev_device_get_sysattr_value(device, "address"), + if (net_match_config(link->match_mac, link->match_path, link->match_driver, + link->match_type, NULL, link->match_host, + link->match_virt, link->match_kernel, link->match_arch, + ether_aton(udev_device_get_sysattr_value(device, "address")), udev_device_get_property_value(device, "ID_PATH"), - udev_device_get_driver(device), + udev_device_get_driver(udev_device_get_parent(device)), + udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), NULL)) { log_debug("Config file %s applies to device %s", @@ -278,64 +284,49 @@ static bool mac_is_random(struct udev_device *device) { if (r < 0) return false; - /* check for NET_ADDR_RANDOM */ - return type == 1; + return type == NET_ADDR_RANDOM; } -static bool mac_is_permanent(struct udev_device *device) { +static bool should_rename(struct udev_device *device, bool respect_predictable) { const char *s; unsigned type; int r; - s = udev_device_get_sysattr_value(device, "addr_assign_type"); + s = udev_device_get_sysattr_value(device, "name_assign_type"); if (!s) - return true; /* if we don't know, assume it is permanent */ + return true; /* if we don't know, assume we should rename */ r = safe_atou(s, &type); if (r < 0) return true; - /* check for NET_ADDR_PERM */ - return type == 0; + switch (type) { + case NET_NAME_USER: + case NET_NAME_RENAMED: + return false; /* these were already named by userspace, do not touch again */ + case NET_NAME_PREDICTABLE: + if (respect_predictable) + return false; /* the kernel claims to have given a predictable name */ + /* fall through */ + case NET_NAME_ENUM: + default: + return true; /* the name is known to be bad, or of an unknown type */ + } } static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) { - unsigned int seed; - int r, i; + int r; if (want_random) - seed = random_u(); + random_bytes(mac->ether_addr_octet, ETH_ALEN); else { - const char *name; - sd_id128_t machine; - char machineid_buf[33]; - const char *seed_str; - - /* fetch some persistent data unique (on this machine) to this device */ - name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD"); - if (!name) { - name = udev_device_get_property_value(device, "ID_NET_NAME_SLOT"); - if (!name) { - name = udev_device_get_property_value(device, "ID_NET_NAME_PATH"); - if (!name) - return -ENOENT; - } - } - /* fetch some persistent data unique to this machine */ - r = sd_id128_get_machine(&machine); + uint8_t result[8]; + + r = net_get_unique_predictable_data(device, result); if (r < 0) return r; - /* combine the data */ - seed_str = strappenda(name, sd_id128_to_string(machine, machineid_buf)); - - /* hash to get seed */ - seed = string_hash_func(seed_str); - } - - srandom(seed); - - for(i = 0; i < ETH_ALEN; i++) { - mac->ether_addr_octet[i] = random(); + assert_cc(ETH_ALEN <= sizeof(result)); + memcpy(mac->ether_addr_octet, result, ETH_ALEN); } /* see eth_random_addr in the kernel */ @@ -350,6 +341,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev const char *new_name = NULL; struct ether_addr generated_mac; struct ether_addr *mac = NULL; + bool respect_predictable = false; int r, ifindex; assert(ctx); @@ -365,18 +357,11 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev if (!old_name) return -EINVAL; - if (config->description) { - r = udev_device_set_sysattr_value(device, "ifalias", - config->description); - if (r < 0) - log_warning("Could not set description of %s to '%s': %s", - old_name, config->description, strerror(-r)); - } - - r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed, config->duplex); + r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed / 1024, config->duplex); if (r < 0) - log_warning("Could not set speed or duplex of %s to %u Mbytes (%s): %s", - old_name, config->speed, duplex_to_string(config->duplex), strerror(-r)); + log_warning("Could not set speed or duplex of %s to %u Mbps (%s): %s", + old_name, config->speed / 1024, duplex_to_string(config->duplex), + strerror(-r)); r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol); if (r < 0) @@ -392,8 +377,15 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev if (ctx->enable_name_policy && config->name_policy) { NamePolicy *policy; - for (policy = config->name_policy; !new_name && *policy != _NAMEPOLICY_INVALID; policy++) { + for (policy = config->name_policy; !respect_predictable && !new_name && + *policy != _NAMEPOLICY_INVALID; policy++) { switch (*policy) { + case NAMEPOLICY_KERNEL: + respect_predictable = true; + break; + case NAMEPOLICY_DATABASE: + new_name = udev_device_get_property_value(device, "ID_NET_NAME_FROM_DATABASE"); + break; case NAMEPOLICY_ONBOARD: new_name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD"); break; @@ -412,18 +404,22 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev } } - if (new_name) - *name = new_name; /* a name was set by a policy */ - else if (config->name) - *name = config->name; /* a name was set manually in the config */ - else - *name = NULL; + if (should_rename(device, respect_predictable)) { + if (!new_name) + /* if not set by policy, fall back manually set name */ + new_name = config->name; + } else + new_name = NULL; + + *name = new_name; switch (config->mac_policy) { case MACPOLICY_PERSISTENT: - if (!mac_is_permanent(device)) { + if (mac_is_random(device)) { r = get_mac(device, false, &generated_mac); - if (r < 0) + if (r == -ENOENT) + break; + else if (r < 0) return r; mac = &generated_mac; } @@ -431,7 +427,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev case MACPOLICY_RANDOM: if (!mac_is_random(device)) { r = get_mac(device, true, &generated_mac); - if (r < 0) + if (r == -ENOENT) + break; + else if (r < 0) return r; mac = &generated_mac; } @@ -440,16 +438,37 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev mac = config->mac; } - r = rtnl_set_link_properties(ctx->rtnl, ifindex, mac, config->mtu); + r = rtnl_set_link_properties(ctx->rtnl, ifindex, config->alias, mac, config->mtu); if (r < 0) { - log_warning("Could not set MACAddress or MTU on %s: %s", old_name, strerror(-r)); + log_warning("Could not set Alias, MACAddress or MTU on %s: %s", old_name, strerror(-r)); return r; } return 0; } -static const char* const mac_policy_table[] = { +int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret) { + const char *name; + char *driver; + int r; + + r = link_config_ctx_connect(ctx); + if (r < 0) + return r; + + name = udev_device_get_sysname(device); + if (!name) + return -EINVAL; + + r = ethtool_get_driver(ctx->ethtool_fd, name, &driver); + if (r < 0) + return r; + + *ret = driver; + return 0; +} + +static const char* const mac_policy_table[_MACPOLICY_MAX] = { [MACPOLICY_PERSISTENT] = "persistent", [MACPOLICY_RANDOM] = "random" }; @@ -457,7 +476,9 @@ static const char* const mac_policy_table[] = { DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy); DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy"); -static const char* const name_policy_table[] = { +static const char* const name_policy_table[_NAMEPOLICY_MAX] = { + [NAMEPOLICY_KERNEL] = "kernel", + [NAMEPOLICY_DATABASE] = "database", [NAMEPOLICY_ONBOARD] = "onboard", [NAMEPOLICY_SLOT] = "slot", [NAMEPOLICY_PATH] = "path",