Changeset 79495 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Jul 3, 2019 12:52:53 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/thread-win.cpp: Don't give windows a 64KB aligned stack size, because then we won't get any overflow protection.

File:

• trunk/src/VBox/Runtime/r3/win/thread-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -44 +44 @@
 #include <iprt/log.h>
 #include <iprt/mem.h>
+#include <iprt/param.h>
 #include "internal/thread.h"
 #include "internal-r3-win.h"
@@ -265 +266 @@
 
     /*
+     * If a stack size is given, make sure it's not a multiple of 64KB so that we
+     * get one or more pages for overflow protection.  (ASSUMES 64KB alloc align.)
+     */
+    unsigned cbStack = (unsigned)pThread->cbStack;
+    if (cbStack > 0 && RT_ALIGN_T(cbStack, _64K, unsigned) == cbStack)
+        cbStack += PAGE_SIZE;
+
+    /*
      * Create the thread.
      */
     pThread->hThread = (uintptr_t)INVALID_HANDLE_VALUE;
     unsigned    uThreadId = 0;
-    uintptr_t   hThread = _beginthreadex(NULL, (unsigned)pThread->cbStack, rtThreadNativeMain, pThread, 0, &uThreadId);
+    uintptr_t   hThread   = _beginthreadex(NULL, cbStack, rtThreadNativeMain, pThread, 0, &uThreadId);
     if (hThread != 0 && hThread != ~0U)
     {