Changeset 12423 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 12, 2008 2:42:49 PM (16 years ago)

Author:

vboxsync

Message:

IPRT/SUP: Renamed RTLdrOpenAppSharedLib to RTLdrOpenAppPriv. Hardend versions of RTLdrOpen and RTLdrOpenAppPriv. Use the hardend versions where appropriate.

Location:

trunk/src/VBox/Devices

Files:

• Serial/DevSerial.cpp (modified) (2 diffs)
• Storage/VBoxHDD-new.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -242 +242 @@
     if (RT_LIKELY(s->pDrvChar))
         s->pDrvChar->pfnSetParameters(s->pDrvChar, speed, parity, data_bits, stop_bits);
+#ifdef RT_OS_DARWIN
+    if (RT_LIKELY(s->pDrvChar))
+        s->cNsDelay = (69444 - 2000) / s->divider; /* 69444 == 1000,000,000 / (115,000 / 8); 2000 = fudge factor */
+#endif
 }
 
@@ -386 +390 @@
     case 5:
         ret = s->lsr;
+#ifdef RT_OS_DARWIN
+        if (    !(ret & UART_LSR_THRE)
+            &&   pThis->HeldXmitNanoTS
+            &&  RTTimeNanoTS() - s->HeldXmitNanoTS >= s->cNsDelay) {
+            ret = s->lsr |= UART_LSR_THRE;
+        }
+#endif
         break;
     case 6:

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -26 +26 @@
 #include <VBox/VBoxHDD-new.h>
 #include <VBox/err.h>
-
+#include <VBox/sup.h>
 #include <VBox/log.h>
+
 #include <iprt/alloc.h>
 #include <iprt/assert.h>
@@ -195 +196 @@
 
         /* Try to load the plugin (RTLdrLoad takes care of the suffix). */
-        rc = RTLdrLoad(pszPluginName, &hPlugin);
+        rc = SUPR3HardenedLdrLoad(pszPluginName, &hPlugin);
         if (RT_SUCCESS(rc))
         {
@@ -730 +731 @@
             }
 
-            rc = RTLdrLoad(pszPluginPath, &hPlugin);
+            rc = SUPR3HardenedLdrLoad(pszPluginPath, &hPlugin);
             if (RT_SUCCESS(rc))
             {
@@ -1015 +1016 @@
             }
 
-            rc = RTLdrLoad(pszPluginPath, &hPlugin);
+            rc = SUPR3HardenedLdrLoad(pszPluginPath, &hPlugin);
             if (RT_SUCCESS(rc))
             {