Changeset 45300 in vbox for trunk/src

Timestamp:

Apr 3, 2013 9:48:39 AM (12 years ago)

Author:

vboxsync

Message:

Linux: more CONFIG_UIDGID_STRICT_TYPE_CHECKS fixes

Location:

trunk/src/VBox

Files:

• Additions/linux/sharedfolders/utils.c (modified) (1 diff)
• HostDrivers/Support/linux/SUPDrv-linux.c (modified) (3 diffs)
• HostDrivers/VBoxPci/linux/VBoxPci-linux.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -146 +146 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-    inode->i_uid = KUIDT_INIT(sf_g->uid);
-    inode->i_gid = KGIDT_INIT(sf_g->gid);
+    inode->i_uid = make_kuid(current_user_ns(), sf_g->uid);
+    inode->i_gid = make_kgid(current_user_ns(), sf_g->gid);
 #else
     inode->i_uid = sf_g->uid;

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

@@ -254 +254 @@
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+    return from_kuid(current_user_ns(), current->cred->uid);
+# else
     return current->cred->uid;
+# endif
 #else
     return current->uid;
@@ -263 +267 @@
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+    return from_kgid(current_user_ns(), current->cred->gid);
+# else
     return current->cred->gid;
+# endif
 #else
     return current->gid;
@@ -272 +280 @@
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+    return from_kuid(current_user_ns(), current->cred->euid);
+# else
     return current->cred->euid;
+# endif
 #else
     return current->euid;

trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c

@@ -430 +430 @@
                 goto done;
 
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+        pNewCreds->fsuid = GLOBAL_ROOT_UID;
+# else
         pNewCreds->fsuid = 0;
+# endif
         pOldCreds = override_creds(pNewCreds);
 #endif
@@ -540 +544 @@
             goto done;
 
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+        pNewCreds->fsuid = GLOBAL_ROOT_UID;
+# else
         pNewCreds->fsuid = 0;
+# endif
         pOldCreds = override_creds(pNewCreds);
 #endif