From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 23 Jun 2021 07:17:21 +0000 (+0900)
Subject: udev: refuse invalid ifname earlier
X-Git-Tag: v249-rc2~11^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=068b0f77289411ef9f92f5d701759e98145a06e4;p=thirdparty%2Fsystemd.git

udev: refuse invalid ifname earlier
---

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 8a01e2512e3..b28089be71c 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -17,6 +17,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "format-util.h"
+#include "netif-naming-scheme.h"
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -848,6 +849,12 @@ static int rename_netif(UdevEvent *event) {
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to get ifindex: %m");
 
+        if (naming_scheme_has(NAMING_REPLACE_STRICTLY) &&
+            !ifname_valid(event->name)) {
+                log_device_warning(dev, "Invalid network interface name, ignoring: %s", event->name);
+                return 0;
+        }
+
         /* Set ID_RENAMING boolean property here, and drop it in the corresponding move uevent later. */
         r = device_add_property(dev, "ID_RENAMING", "1");
         if (r < 0)