Mercurial > hg > openjdk > icedtea > jdk7 > hotspot
changeset 611:2f716c0acb64
6567360: 3/4 SIGBUS in jvmti RawMonitor magic check for unaligned bad monitor pointer
Summary: Change JvmtiEnvBase::is_valid() and JvmtiRawMonitor::is_valid() to fetch the _magic fields via Bytes::get_native_u[248]().
Reviewed-by: coleenp, swamyv
| author | dcubed |
|---|---|
| date | Mon, 02 Mar 2009 14:05:07 -0700 |
| parents | 70998f2e05ef |
| children | afa80fa86d22 |
| files | src/share/vm/prims/jvmtiEnvBase.cpp src/share/vm/prims/jvmtiEnvBase.hpp src/share/vm/prims/jvmtiImpl.cpp src/share/vm/prims/jvmtiImpl.hpp |
| diffstat | 4 files changed, 60 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnvBase.cpp Mon Mar 02 14:03:03 2009 -0700 +++ b/src/share/vm/prims/jvmtiEnvBase.cpp Mon Mar 02 14:05:07 2009 -0700 @@ -94,6 +94,35 @@ } +bool +JvmtiEnvBase::is_valid() { + jint value = 0; + + // This object might not be a JvmtiEnvBase so we can't assume + // the _magic field is properly aligned. Get the value in a safe + // way and then check against JVMTI_MAGIC. + + switch (sizeof(_magic)) { + case 2: + value = Bytes::get_native_u2((address)&_magic); + break; + + case 4: + value = Bytes::get_native_u4((address)&_magic); + break; + + case 8: + value = Bytes::get_native_u8((address)&_magic); + break; + + default: + guarantee(false, "_magic field is an unexpected size"); + } + + return value == JVMTI_MAGIC; +} + + JvmtiEnvBase::JvmtiEnvBase() : _env_event_enable() { _env_local_storage = NULL; _tag_map = NULL;
--- a/src/share/vm/prims/jvmtiEnvBase.hpp Mon Mar 02 14:03:03 2009 -0700 +++ b/src/share/vm/prims/jvmtiEnvBase.hpp Mon Mar 02 14:05:07 2009 -0700 @@ -120,7 +120,7 @@ public: - bool is_valid() { return _magic == JVMTI_MAGIC; } + bool is_valid(); bool is_retransformable() { return _is_retransformable; }
--- a/src/share/vm/prims/jvmtiImpl.cpp Mon Mar 02 14:03:03 2009 -0700 +++ b/src/share/vm/prims/jvmtiImpl.cpp Mon Mar 02 14:05:07 2009 -0700 @@ -238,6 +238,35 @@ } +bool +JvmtiRawMonitor::is_valid() { + int value = 0; + + // This object might not be a JvmtiRawMonitor so we can't assume + // the _magic field is properly aligned. Get the value in a safe + // way and then check against JVMTI_RM_MAGIC. + + switch (sizeof(_magic)) { + case 2: + value = Bytes::get_native_u2((address)&_magic); + break; + + case 4: + value = Bytes::get_native_u4((address)&_magic); + break; + + case 8: + value = Bytes::get_native_u8((address)&_magic); + break; + + default: + guarantee(false, "_magic field is an unexpected size"); + } + + return value == JVMTI_RM_MAGIC; +} + + // // class JvmtiBreakpoint //
--- a/src/share/vm/prims/jvmtiImpl.hpp Mon Mar 02 14:03:03 2009 -0700 +++ b/src/share/vm/prims/jvmtiImpl.hpp Mon Mar 02 14:05:07 2009 -0700 @@ -349,7 +349,7 @@ ~JvmtiRawMonitor(); int magic() { return _magic; } const char *get_name() { return _name; } - bool is_valid() { return _magic == JVMTI_RM_MAGIC; } + bool is_valid(); }; // Onload pending raw monitors