X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.c;h=c308f898ea26eb8ae61d9d819e95415c581d9626;hb=07630cea1f3a845c09309f197ac7c4f11edd3b62;hp=c2881d6b41d0f08c692263684f7946d787762b58;hpb=eb7040ec50fbfe5aad9eaf305bd442a4a235abaa;p=thirdparty%2Fsystemd.git diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index c2881d6b41d..c308f898ea2 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -22,25 +22,22 @@ #include #include -#include "sd-id128.h" +#include "sd-netlink.h" -#include "missing.h" -#include "link-config.h" +#include "conf-files.h" +#include "conf-parser.h" #include "ethtool-util.h" - #include "libudev-private.h" -#include "sd-rtnl.h" -#include "util.h" +#include "link-config.h" #include "log.h" -#include "strv.h" -#include "path-util.h" -#include "conf-parser.h" -#include "conf-files.h" -#include "fileio.h" -#include "hashmap.h" -#include "rtnl-util.h" +#include "missing.h" +#include "netlink-util.h" #include "network-internal.h" -#include "siphash24.h" +#include "path-util.h" +#include "random-util.h" +#include "string-util.h" +#include "strv.h" +#include "util.h" struct link_config_ctx { LIST_HEAD(link_config, links); @@ -49,7 +46,7 @@ struct link_config_ctx { bool enable_name_policy; - sd_rtnl *rtnl; + sd_netlink *rtnl; usec_t link_dirs_ts_usec; }; @@ -63,54 +60,32 @@ static const char* const link_dirs[] = { #endif NULL}; -DEFINE_TRIVIAL_CLEANUP_FUNC(link_config_ctx*, link_config_ctx_free); -#define _cleanup_link_config_ctx_free_ _cleanup_(link_config_ctx_freep) - -int link_config_ctx_new(link_config_ctx **ret) { - _cleanup_link_config_ctx_free_ link_config_ctx *ctx = NULL; - - if (!ret) - return -EINVAL; - - ctx = new0(link_config_ctx, 1); - if (!ctx) - return -ENOMEM; - - LIST_HEAD_INIT(ctx->links); - - ctx->ethtool_fd = -1; - - ctx->enable_name_policy = true; - - *ret = ctx; - ctx = NULL; +static void link_config_free(link_config *link) { + if (!link) + return; - return 0; + free(link->filename); + + free(link->match_mac); + strv_free(link->match_path); + strv_free(link->match_driver); + strv_free(link->match_type); + free(link->match_name); + free(link->match_host); + free(link->match_virt); + free(link->match_kernel); + free(link->match_arch); + + free(link->description); + free(link->mac); + free(link->name_policy); + free(link->name); + free(link->alias); + + free(link); } -static int link_config_ctx_connect(link_config_ctx *ctx) { - int 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; - } - } - - 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; -} +DEFINE_TRIVIAL_CLEANUP_FUNC(link_config*, link_config_free); static void link_configs_free(link_config_ctx *ctx) { link_config *link, *link_next; @@ -118,17 +93,8 @@ static void link_configs_free(link_config_ctx *ctx) { if (!ctx) return; - LIST_FOREACH_SAFE(links, link, link_next, ctx->links) { - free(link->filename); - free(link->match_path); - free(link->match_driver); - free(link->match_type); - free(link->description); - free(link->alias); - free(link->name_policy); - - free(link); - } + LIST_FOREACH_SAFE(links, link, link_next, ctx->links) + link_config_free(link); } void link_config_ctx_free(link_config_ctx *ctx) { @@ -137,7 +103,7 @@ void link_config_ctx_free(link_config_ctx *ctx) { safe_close(ctx->ethtool_fd); - sd_rtnl_unref(ctx->rtnl); + sd_netlink_unref(ctx->rtnl); link_configs_free(ctx); @@ -146,8 +112,32 @@ void link_config_ctx_free(link_config_ctx *ctx) { return; } +DEFINE_TRIVIAL_CLEANUP_FUNC(link_config_ctx*, link_config_ctx_free); + +int link_config_ctx_new(link_config_ctx **ret) { + _cleanup_(link_config_ctx_freep) link_config_ctx *ctx = NULL; + + if (!ret) + return -EINVAL; + + ctx = new0(link_config_ctx, 1); + if (!ctx) + return -ENOMEM; + + LIST_HEAD_INIT(ctx->links); + + ctx->ethtool_fd = -1; + + ctx->enable_name_policy = true; + + *ret = ctx; + ctx = NULL; + + return 0; +} + static int load_link(link_config_ctx *ctx, const char *filename) { - _cleanup_free_ link_config *link = NULL; + _cleanup_(link_config_freep) link_config *link = NULL; _cleanup_fclose_ FILE *file = NULL; int r; @@ -184,6 +174,9 @@ static int load_link(link_config_ctx *ctx, const char *filename) { else log_debug("Parsed configuration file %s", filename); + if (link->mtu > UINT_MAX || link->speed > UINT_MAX) + return -ERANGE; + link->filename = strdup(filename); LIST_PREPEND(links, ctx->links, link); @@ -199,11 +192,10 @@ static bool enable_name_policy(void) { size_t l; r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", - strerror(-r)); - if (r <= 0) + if (r < 0) { + log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m"); return true; + } FOREACH_WORD_QUOTED(word, l, line, state) if (strneq(word, "net.ifnames=0", l)) @@ -221,17 +213,15 @@ int link_config_load(link_config_ctx *ctx) { if (!enable_name_policy()) { ctx->enable_name_policy = false; - log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring."); + log_info("Network interface NamePolicy= disabled on kernel command line, ignoring."); } /* update timestamp */ paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, true); 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; - } + if (r < 0) + return log_error_errno(r, "failed to enumerate link files: %m"); STRV_FOREACH_BACKWARDS(f, files) { r = load_link(ctx, *f); @@ -250,22 +240,50 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_config **ret) { link_config *link; + assert(ctx); + assert(device); + assert(ret); + LIST_FOREACH(links, link, ctx->links) { - const char* attr_value = udev_device_get_sysattr_value(device, "address"); + const char* attr_value; + + attr_value = 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_type, link->match_name, link->match_host, link->match_virt, link->match_kernel, link->match_arch, attr_value ? ether_aton(attr_value) : NULL, udev_device_get_property_value(device, "ID_PATH"), udev_device_get_driver(udev_device_get_parent(device)), udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), - NULL)) { + udev_device_get_sysname(device))) { + if (link->match_name) { + unsigned char name_assign_type = NET_NAME_UNKNOWN; + + attr_value = udev_device_get_sysattr_value(device, "name_assign_type"); + if (attr_value) + (void) safe_atou8(attr_value, &name_assign_type); + + if (name_assign_type == NET_NAME_ENUM) { + log_warning("Config file %s applies to device based on potentially unpredictable interface name '%s'", + link->filename, udev_device_get_sysname(device)); + *ret = link; + + return 0; + } else if (name_assign_type == NET_NAME_RENAMED) { + log_warning("Config file %s matches device based on renamed interface name '%s', ignoring", + link->filename, udev_device_get_sysname(device)); + + continue; + } + } + log_debug("Config file %s applies to device %s", - link->filename, - udev_device_get_sysname(device)); + link->filename, udev_device_get_sysname(device)); + *ret = link; + return 0; } } @@ -361,25 +379,20 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, assert(device); assert(name); - r = link_config_ctx_connect(ctx); - if (r < 0) - return r; - old_name = udev_device_get_sysname(device); if (!old_name) return -EINVAL; - r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed / 1024, - 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 Mbps (%s): %s", - old_name, config->speed / 1024, - duplex_to_string(config->duplex), strerror(-r)); + log_warning_errno(r, "Could not set speed or duplex of %s to %zu Mbps (%s): %m", + old_name, config->speed / 1024, + duplex_to_string(config->duplex)); - r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol); + r = ethtool_set_wol(&ctx->ethtool_fd, old_name, config->wol); if (r < 0) - log_warning("Could not set WakeOnLan of %s to %s: %s", - old_name, wol_to_string(config->wol), strerror(-r)); + log_warning_errno(r, "Could not set WakeOnLan of %s to %s: %m", + old_name, wol_to_string(config->wol)); ifindex = udev_device_get_ifindex(device); if (ifindex <= 0) { @@ -424,15 +437,14 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, } else new_name = NULL; - *name = new_name; - switch (config->mac_policy) { case MACPOLICY_PERSISTENT: if (mac_is_random(device)) { r = get_mac(device, false, &generated_mac); - if (r == -ENOENT) + if (r == -ENOENT) { + log_warning_errno(r, "Could not generate persistent MAC address for %s: %m", old_name); break; - else if (r < 0) + } else if (r < 0) return r; mac = &generated_mac; } @@ -440,42 +452,38 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, case MACPOLICY_RANDOM: if (!mac_is_random(device)) { r = get_mac(device, true, &generated_mac); - if (r == -ENOENT) + if (r == -ENOENT) { + log_warning_errno(r, "Could not generate random MAC address for %s: %m", old_name); break; - else if (r < 0) + } else if (r < 0) return r; mac = &generated_mac; } break; + case MACPOLICY_NONE: default: mac = config->mac; } - r = rtnl_set_link_properties(ctx->rtnl, ifindex, config->alias, mac, - config->mtu); - if (r < 0) { - log_warning("Could not set Alias, MACAddress or MTU on %s: %s", - old_name, strerror(-r)); - return r; - } + r = rtnl_set_link_properties(&ctx->rtnl, ifindex, config->alias, mac, config->mtu); + if (r < 0) + return log_warning_errno(r, "Could not set Alias, MACAddress or MTU on %s: %m", old_name); + + *name = new_name; return 0; } int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret) { const char *name; - char *driver; + char *driver = NULL; 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); + r = ethtool_get_driver(&ctx->ethtool_fd, name, &driver); if (r < 0) return r; @@ -485,7 +493,8 @@ int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret static const char* const mac_policy_table[_MACPOLICY_MAX] = { [MACPOLICY_PERSISTENT] = "persistent", - [MACPOLICY_RANDOM] = "random" + [MACPOLICY_RANDOM] = "random", + [MACPOLICY_NONE] = "none" }; DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy);