summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2016-06-12 21:53:48 +0000
committerGreg Lewis <glewis@FreeBSD.org>2016-06-12 21:53:48 +0000
commitb13b21cc6ce59f2fc823a5a98e1ac860a14f1388 (patch)
tree12d04464800eb51479339e75452ca9f9c1130f91
parentThis is a django-otp plugin that handles YubiKey devices using the Yubico OTP (diff)
Handle unsafe operations that access invalid memory more gracefully
PR: 209599 Submitted by: Andrew Smith <iamasmith.home@gmail.com>
Notes
Notes: svn path=/head/; revision=416825
-rw-r--r--java/openjdk8/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/java/openjdk8/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp b/java/openjdk8/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp
new file mode 100644
index 000000000000..3ab8e6429a8f
--- /dev/null
+++ b/java/openjdk8/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp
@@ -0,0 +1,14 @@
+--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2016-05-20 12:24:21.966092000 +0100
++++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2016-05-20 12:46:40.522912000 +0100
+@@ -594,7 +596,11 @@
+ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
+ }
+ } else if (thread->thread_state() == _thread_in_vm &&
++#ifdef __FreeBSD__
++ (sig == SIGBUS || sig == SIGSEGV) &&
++#else
+ sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
++#endif
+ thread->doing_unsafe_access()) {
+ stub = StubRoutines::handler_for_unsafe_access();
+ }