Blame SOURCES/rh1566890-CVE_2018_3639-speculative_store_bypass.patch

ecab97
diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
ecab97
--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
ecab97
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
ecab97
@@ -103,6 +103,8 @@
ecab97
 # include <inttypes.h>
ecab97
 # include <sys/ioctl.h>
ecab97
 
ecab97
+#include <sys/prctl.h>
ecab97
+
ecab97
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
ecab97
 
ecab97
 #ifndef _GNU_SOURCE
ecab97
@@ -4997,6 +4999,31 @@
ecab97
   }
ecab97
 }
ecab97
 
ecab97
+/* Per task speculation control */
ecab97
+#ifndef PR_GET_SPECULATION_CTRL
ecab97
+#define PR_GET_SPECULATION_CTRL    52
ecab97
+#endif
ecab97
+#ifndef PR_SET_SPECULATION_CTRL
ecab97
+#define PR_SET_SPECULATION_CTRL    53
ecab97
+#endif
ecab97
+/* Speculation control variants */
ecab97
+# undef PR_SPEC_STORE_BYPASS
ecab97
+# define PR_SPEC_STORE_BYPASS          0
ecab97
+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
ecab97
+# undef PR_SPEC_NOT_AFFECTED
ecab97
+# undef PR_SPEC_PRCTL
ecab97
+# undef PR_SPEC_ENABLE
ecab97
+# undef PR_SPEC_DISABLE
ecab97
+# define PR_SPEC_NOT_AFFECTED          0
ecab97
+# define PR_SPEC_PRCTL                 (1UL << 0)
ecab97
+# define PR_SPEC_ENABLE                (1UL << 1)
ecab97
+# define PR_SPEC_DISABLE               (1UL << 2)
ecab97
+
ecab97
+static void set_speculation() __attribute__((constructor));
ecab97
+static void set_speculation() {
ecab97
+  prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
ecab97
+}
ecab97
+
ecab97
 // this is called _before_ most of the global arguments have been parsed
ecab97
 void os::init(void) {
ecab97
   char dummy;   /* used to get a guess on initial stack address */