Changeset 7130 in vbox for trunk/src/VBox

Timestamp:

Feb 25, 2008 4:44:45 PM (17 years ago)

Author:

vboxsync

Message:

Linux kmod: VBOX_REDHAT_KABI

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDRVShared.c (modified) (2 diffs)
• linux/Makefile (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c

@@ -630 +630 @@
 
 /**
+ * Helper for supdrvIOCtl. Check if pszStr contains any character of pszChars.
+ * We would use strpbrk here if this function would be contained in the RedHat kABI white
+ * list, see http://www.kerneldrivers.org/RHEL5.
+ *
+ * @return 1 if pszStr does contain any character of pszChars, 0 otherwise.
+ * @param    pszStr     String to check
+ * @param    pszChars   Character set
+ */
+static int supdrvCheckInvalidChar(const char *pszStr, const char *pszChars)
+{
+    int chCur;
+    while ((chCur = *pszStr++) != '\0')
+    {
+        int ch;
+        const char *psz = pszChars;
+        while ((ch = *psz++) != '\0')
+            if (ch == chCur)
+                return 1;
+
+    }
+    return 0;
+}
+
+
+/**
  * I/O Control worker.
  *
@@ -896 +921 @@
             REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.szName[0]);
             REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, memchr(pReq->u.In.szName, '\0', sizeof(pReq->u.In.szName)));
-            REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, !strpbrk(pReq->u.In.szName, ";:()[]{}/\\|&*%#@!~`\"'"));
+            REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, !supdrvCheckInvalidChar(pReq->u.In.szName, ";:()[]{}/\\|&*%#@!~`\"'"));
 
             /* execute */

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -196 +196 @@
 endif
 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX
+ifdef VBOX_REDHAT_KABI
+ KFLAGS  += -DVBOX_REDHAT_KABI
+endif
 ifndef CONFIG_VBOXDRV_FIXEDMAJOR
  KFLAGS  += -DCONFIG_VBOXDRV_AS_MISC

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

@@ -204 +204 @@
  */
 # if defined(RT_ARCH_AMD64)
-#  if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+#  if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21) && !defined(VBOX_REDHAT_KABI)
 #   define DO_DISABLE_NMI 1
 #  endif
@@ -506 +506 @@
      * we don't allow to setup an NMI watchdog.
      */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && !defined(VBOX_REDHAT_KABI)
     /*
      * First test: NMI actiated? Works only works with Linux 2.6 -- 2.4 does not export
@@ -569 +569 @@
         goto nmi_activated;
 #  endif
-# endif /* >= 2.6.0 */
+# endif /* >= 2.6.0 && !defined(VBOX_REDHAT_KABI) */
 
     /*
@@ -598 +598 @@
                 return -EINVAL;
 # else /* < 2.6.19 */
-#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && !defined(VBOX_REDHAT_KABI)
 nmi_activated:
 #  endif
@@ -1399 +1399 @@
 {
 #ifdef CONFIG_SMP
-# if defined(num_present_cpus)
+# if defined(num_present_cpus) && !defined(VBOX_REDHAT_KABI)
     return num_present_cpus();
-# elif defined(num_online_cpus)
-    return num_online_cpus();
+# elif defined(num_possible_cpus)
+    return num_possible_cpus();
 # else
     return smp_num_cpus;