Changeset 63673 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Aug 31, 2016 11:16:18 AM (8 years ago)

Author:

vboxsync

Message:

HostDrivers/Support: make setting capabilities compatible for newer kernels

File:

• trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp

@@ -512 +512 @@
 # ifdef RT_OS_LINUX
 static uint32_t         g_uCaps;
+static uint32_t         g_uCapsVersion;
 # endif
 #endif
@@ -1808 +1809 @@
 #  else
         cap_user_header_t hdr = (cap_user_header_t)alloca(sizeof(*hdr));
-        cap_user_data_t   cap = (cap_user_data_t)alloca(sizeof(*cap));
+        cap_user_data_t   cap = (cap_user_data_t)alloca(2 /*_LINUX_CAPABILITY_U32S_3*/ * sizeof(*cap));
         memset(hdr, 0, sizeof(*hdr));
-        hdr->version = _LINUX_CAPABILITY_VERSION;
-        memset(cap, 0, sizeof(*cap));
+        capget(&hdr, NULL);
+        if (   hdr->version != 0x19980330 /* _LINUX_CAPABILITY_VERSION_1, _LINUX_CAPABILITY_U32S_1 = 1 */
+            && hdr->version != 0x20071026 /* _LINUX_CAPABILITY_VERSION_2, _LINUX_CAPABILITY_U32S_2 = 2 */
+            && hdr->version != 0x20080522 /* _LINUX_CAPABILITY_VERSION_3, _LINUX_CAPABILITY_U32S_3 = 2 */)
+            hdr->version = _LINUX_CAPABILITY_VERSION;
+        g_uCapsVersion = hdr->version;
+        memset(cap, 0, 2 /* _LINUX_CAPABILITY_U32S_3 */ * sizeof(*cap));
         cap->effective = g_uCaps;
         cap->permitted = g_uCaps;
@@ -1982 +1988 @@
 #  else
         cap_user_header_t hdr = (cap_user_header_t)alloca(sizeof(*hdr));
-        cap_user_data_t   cap = (cap_user_data_t)alloca(sizeof(*cap));
+        cap_user_data_t   cap = (cap_user_data_t)alloca(2 /* _LINUX_CAPABILITY_U32S_3 */ * sizeof(*cap));
         memset(hdr, 0, sizeof(*hdr));
-        hdr->version = _LINUX_CAPABILITY_VERSION;
-        memset(cap, 0, sizeof(*cap));
+        hdr->version = g_uCapsVersion;
+        memset(cap, 0, 2 /* _LINUX_CAPABILITY_U32S_3 */ * sizeof(*cap));
         cap->effective = g_uCaps;
         cap->permitted = g_uCaps;