enable GS Cookie on OSX (#39143)

* enable GS Cookie on OSX * Actual fix
dotnet · Jul 13, 2020 · 371ae3c · 371ae3c
1 parent 7b2e585
commit 371ae3c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/coreclr/src/vm/ceemain.cpp b/src/coreclr/src/vm/ceemain.cpp
@@ -484,13 +484,6 @@ void InitGSCookie()
     }
     CONTRACTL_END;
 
-#if defined(TARGET_OSX) && defined(CORECLR_EMBEDDED)
-    // OSX does not like the way we change section protection when running in a superhost bundle
-    // disabling this for now
-    // https://github.com/dotnet/runtime/issues/38184
-    return;
-#endif
-
     volatile GSCookie * pGSCookiePtr = GetProcessGSCookiePtr();
 
 #ifdef TARGET_UNIX

diff --git a/src/coreclr/src/vm/vars.hpp b/src/coreclr/src/vm/vars.hpp
@@ -694,7 +694,7 @@ typedef DPTR(GSCookie) PTR_GSCookie;
 #define READONLY_ATTR
 #else
 #ifdef __APPLE__
-#define READONLY_ATTR_ARGS section("__TEXT,__const")
+#define READONLY_ATTR_ARGS section("__DATA,__const")
 #else
 #define READONLY_ATTR_ARGS section(".rodata")
 #endif