Changeset 105163 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 5, 2024 2:26:46 PM (7 months ago)

Author:

vboxsync

Message:

Linux/Network: Do not attach netfilter to wrong names or multiple times, bugref:10713

Location:

trunk/src/VBox/Main

Files:

• include/netif.h (modified) (1 diff)
• src-client/ConsoleImplConfigCommon.cpp (modified) (1 diff)
• src-server/linux/NetIf-linux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/netif.h

@@ -43 +43 @@
 # include <stdio.h>
 #endif /* !RT_OS_WINDOWS */
+
+#ifdef RT_OS_LINUX
+# include <linux/version.h>
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) /* proc_ns introduced */
+#  define VBOXNETFLT_LINUX_NAMESPACE_SUPPORT
+# endif
+#endif
 
 #define VBOXNET_IPV4ADDR_DEFAULT      0x0138A8C0  /* 192.168.56.1 */

trunk/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp

@@ -2660 +2660 @@
                     }
                 }
+#  ifdef VBOXNETFLT_LINUX_NAMESPACE_SUPPORT
+                RTUUID IfaceUuid;
+                Bstr IfId;
+                hrc = hostInterface->COMGETTER(Id)(IfId.asOutParam());                      H();
+                vrc = RTUuidFromUtf16(&IfaceUuid, IfId.raw());
+                AssertRCReturn(vrc, vrc);
+                char szTrunkNameWithNamespace[INTNET_MAX_TRUNK_NAME];
+                RTStrPrintf(szTrunkNameWithNamespace, sizeof(szTrunkNameWithNamespace), "%u/%s",
+                            IfaceUuid.au32[0], pszTrunk);
+                pszTrunk = szTrunkNameWithNamespace;
+#  endif
 
 # else

trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp

@@ -44 +44 @@
 #include <unistd.h>
 #include <iprt/asm.h>
+#include <errno.h>
 
 #include "HostNetworkInterfaceImpl.h"
@@ -155 +156 @@
         RTUUID uuid;
         RTUuidClear(&uuid);
+#ifdef VBOXNETFLT_LINUX_NAMESPACE_SUPPORT
+        uuid.au32[0] = 0;   /* Use 0 as the indicator of missing namespace info. */
+        /*
+         * Namespace links use the following naming convention: "net:[1234567890]".
+         * The maximum value of inode number is 4294967295, which gives up precisely
+         * 16 characters without terminating zero.
+         */
+        char szBuf[24];
+        ssize_t len = readlink("/proc/self/ns/net", szBuf, sizeof(szBuf) - 1);
+        if (len == -1)
+            Log(("NetIfList: Failed to get namespace for VBoxSVC, error %d\n", errno));
+        else if (!RTStrStartsWith(szBuf, "net:["))
+            Log(("NetIfList: Failed to get network namespace inode from %s\n", szBuf));
+        else
+            uuid.au32[0] = RTStrToUInt32(szBuf + 5);
+        Log(("NetIfList: VBoxSVC namespace inode %u\n", uuid.au32[0]));
+        /* Hashing the name is probably an overkill as MAC addresses should ensure uniqueness */
+        uuid.au32[1] = RTStrHash1(pszName);
+#else /* !VBOXNETFLT_LINUX_NAMESPACE_SUPPORT */
         memcpy(&uuid, Req.ifr_name, RT_MIN(sizeof(Req.ifr_name), sizeof(uuid)));
+#endif /* !VBOXNETFLT_LINUX_NAMESPACE_SUPPORT */
         uuid.Gen.u8ClockSeqHiAndReserved = (uint8_t)((uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80);
         uuid.Gen.u16TimeHiAndVersion = (uint16_t)((uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000);