Changeset 70874 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 5, 2018 6:30:15 PM (7 years ago)

Author:

vboxsync

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

120700

Message:

VBoxGuest: Linux build fix. bugref:9105

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -52 +52 @@
 #include <linux/miscdevice.h>
 #include <linux/poll.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+# include <linux/tty.h>
+#endif
 #include <VBox/version.h>
 #include "revision-generated.h"
@@ -57 +60 @@
 #include <iprt/assert.h>
 #include <iprt/asm.h>
+#include <iprt/ctype.h>
 #include <iprt/err.h>
 #include <iprt/initterm.h>
@@ -746 +750 @@
 
 /**
+ * Checks if the given group number is zero or not.
+ *
+ * @returns true / false.
+ * @param   gid                 The group to check for.
+ */
+DECLINLINE(bool) vgdrvLinuxIsGroupZero(kgid_t gid)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+    return from_kgid(current_user_ns(), gid);
+#else
+    return gid == 0;
+#endif
+}
+
+
+/**
  * Searches the effective group and supplementary groups for @a gid.
  *
@@ -770 +790 @@
     uint32_t           fRet = VMMDEV_REQUESTOR_CON_DONT_KNOW;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) /* First with tty_kref_put(). */
     /*
      * Check for tty0..63, ASSUMING that these are only used for the physical console.
@@ -791 +811 @@
                 || (   RT_C_IS_DIGIT(pszName[4])
                     && pszName[5] == '\0'
-                    && (pszName[3] - '0') * 10 + (pszName[4] - '0') <= 63))
+                    && (pszName[3] - '0') * 10 + (pszName[4] - '0') <= 63)) )
                fRet = VMMDEV_REQUESTOR_CON_YES;
         tty_kref_put(pTty);
@@ -825 +845 @@
     if (MINOR(pInode->i_rdev) == g_MiscDeviceUser.minor)
     {
-        fRequestor |= VMMDEV_REQUESTOR_UNTRUSTED_DEVICE;
-        if (pInode->i_gid && vgdrvLinuxIsInGroupEff(pInode->i_gid))
+        fRequestor |= VMMDEV_REQUESTOR_USER_DEVICE;
+        if (vgdrvLinuxIsGroupZero(pInode->i_gid) && vgdrvLinuxIsInGroupEff(pInode->i_gid))
             fRequestor |= VMMDEV_REQUESTOR_GRP_VBOX;
     }