Changeset 91551 in vbox for trunk

Timestamp:

Oct 4, 2021 10:01:46 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147254

Message:

SUPDrV: The SUPDRVSESSION::Uid & Gid members should be the kernel versions, not the within-current-namespace stuff we've been using thus far on linux.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrvInternal.h (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -729 +729 @@
     PSUPDRVUSAGE volatile           pUsage;
 
-    /** The user id of the session. (Set by the OS part.) */
+    /** The user id of the session - set by the OS part or NIL_RTUID.
+     * This should be unique accross namespace/zones/whatever. */
     RTUID                           Uid;
-    /** The group id of the session. (Set by the OS part.) */
+    /** The group id of the session - set by the OS part or NIL_RTGID.
+     * This should be unique accross namespace/zones/whatever.  */
     RTGID                           Gid;
     /** Per session tracer specfic data. */

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -297 +297 @@
 
 
-DECLINLINE(RTUID) vboxdrvLinuxUid(void)
+/** Get the kernel UID for the current process. */
+DECLINLINE(RTUID) vboxdrvLinuxKernUid(void)
 {
 #if RTLNX_VER_MIN(2,6,29)
 # if RTLNX_VER_MIN(3,5,0)
-    return from_kuid(current_user_ns(), current->cred->uid);
+    return __kuid_val(current->cred->uid);
 # else
     return current->cred->uid;
@@ -310 +311 @@
 }
 
-DECLINLINE(RTGID) vboxdrvLinuxGid(void)
+
+/** Get the kernel GID for the current process. */
+DECLINLINE(RTGID) vboxdrvLinuxKernGid(void)
 {
 #if RTLNX_VER_MIN(2,6,29)
 # if RTLNX_VER_MIN(3,5,0)
-    return from_kgid(current_user_ns(), current->cred->gid);
+    return __kgid_val(current->cred->gid);
 # else
     return current->cred->gid;
@@ -323 +326 @@
 }
 
-DECLINLINE(RTUID) vboxdrvLinuxEuid(void)
-{
-#if RTLNX_VER_MIN(2,6,29)
-# if RTLNX_VER_MIN(3,5,0)
+
+#ifdef VBOX_WITH_HARDENING
+/** Get the effective UID within the current user namespace. */
+DECLINLINE(RTUID) vboxdrvLinuxEuidInNs(void)
+{
+# if RTLNX_VER_MIN(2,6,29)
+#  if RTLNX_VER_MIN(3,5,0)
     return from_kuid(current_user_ns(), current->cred->euid);
+#  else
+    return current->cred->euid;
+#  endif
 # else
-    return current->cred->euid;
-# endif
-#else
     return current->euid;
-#endif
-}
+# endif
+}
+#endif
+
 
 /**
@@ -509 +517 @@
      */
     if (   fUnrestricted
-        && vboxdrvLinuxEuid() != 0 /* root */ )
+        && vboxdrvLinuxEuidInNs() != 0 /* root */ )
     {
         Log(("VBoxDrvLinuxCreate: euid=%d, expected 0 (root)\n", vboxdrvLinuxEuid()));
@@ -522 +530 @@
     if (!rc)
     {
-        pSession->Uid = vboxdrvLinuxUid();
-        pSession->Gid = vboxdrvLinuxGid();
+        pSession->Uid = vboxdrvLinuxKernUid();
+        pSession->Gid = vboxdrvLinuxKernGid();
     }