udev: link_setup - respect kernel name assign policy

[elogind.git] / src / udev / net / link-config.c

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 5a45c53cc639c631e899c45014de9f517d3216d4..b44aeaf6db0dd071e5beab0d3e0daade3031cb98 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -20,10 +20,11 @@
 ***/
 
 #include <netinet/ether.h>
-#include <net/if.h>
+#include <linux/netdevice.h>
 
 #include "sd-id128.h"
 
+#include "missing.h"
 #include "link-config.h"
 #include "ethtool-util.h"
 
@@ -153,11 +154,6 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
         assert(ctx);
         assert(filename);
 
-        if (null_or_empty_path(filename)) {
-                log_debug("skipping empty file: %s", filename);
-                return 0;
-        }
-
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
@@ -166,6 +162,11 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
                         return -errno;
         }
 
+        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();
@@ -174,12 +175,13 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
         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("Could not parse config file %s: %s", filename, strerror(-r));
+        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
+        else
                 log_debug("Parsed configuration file %s", filename);
 
         link->filename = strdup(filename);
@@ -192,7 +194,7 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
 
 static bool enable_name_policy(void) {
         _cleanup_free_ char *line = NULL;
-        char *w, *state;
+        const char *word, *state;
         int r;
         size_t l;
 
@@ -202,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;
@@ -282,8 +284,33 @@ 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 should_rename(struct udev_device *device, bool respect_predictable) {
+        const char *s;
+        unsigned type;
+        int r;
+
+        s = udev_device_get_sysattr_value(device, "name_assign_type");
+        if (!s)
+                return true; /* if we don't know, assume we should rename */
+        r = safe_atou(s, &type);
+        if (r < 0)
+                return true;
+
+        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) {
@@ -314,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);
@@ -349,8 +377,12 @@ 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;
@@ -372,12 +404,14 @@ 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:
@@ -443,6 +477,7 @@ 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[_NAMEPOLICY_MAX] = {
+        [NAMEPOLICY_KERNEL] = "kernel",
         [NAMEPOLICY_DATABASE] = "database",
         [NAMEPOLICY_ONBOARD] = "onboard",
         [NAMEPOLICY_SLOT] = "slot",