mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer

Browse Source 
Backport-of: 0e2c72d7a5
This commit is contained in:
Ben Taylor
2023-08-25 19:50:22 +00:00
committed by Vitaly Provodin
parent 986a132b17
commit 24e0f40a32
7 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/aarch64/frame_aarch64.cpp
View File

@@ -508,7 +508,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
// first the method // first the method
Method* m = *interpreter_frame_method_addr(); Method* m = safe_interpreter_frame_method();
// validate the method we'd find in this potential sender // validate the method we'd find in this potential sender
if (!Method::is_valid_method(m)) return false; if (!Method::is_valid_method(m)) return false;

2
src/hotspot/cpu/arm/frame_arm.cpp
View File

@@ -421,7 +421,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
// first the method // first the method
Method* m = *interpreter_frame_method_addr(); Method* m = safe_interpreter_frame_method();
// validate the method we'd find in this potential sender // validate the method we'd find in this potential sender
if (!Method::is_valid_method(m)) return false; if (!Method::is_valid_method(m)) return false;

2
src/hotspot/cpu/ppc/frame_ppc.cpp
View File

@@ -324,7 +324,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
// first the method // first the method
Method* m = *interpreter_frame_method_addr(); Method* m = safe_interpreter_frame_method();
// validate the method we'd find in this potential sender // validate the method we'd find in this potential sender
if (!Method::is_valid_method(m)) return false; if (!Method::is_valid_method(m)) return false;

2
src/hotspot/cpu/riscv/frame_riscv.cpp
View File

@@ -478,7 +478,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
// do some validation of frame elements // do some validation of frame elements
// first the method // first the method
Method* m = *interpreter_frame_method_addr(); Method* m = safe_interpreter_frame_method();
// validate the method we'd find in this potential sender // validate the method we'd find in this potential sender
if (!Method::is_valid_method(m)) { if (!Method::is_valid_method(m)) {
return false; return false;

2
src/hotspot/cpu/x86/frame_x86.cpp
View File

@@ -496,7 +496,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
// do some validation of frame elements // do some validation of frame elements
// first the method // first the method
Method* m = *interpreter_frame_method_addr(); Method* m = safe_interpreter_frame_method();
// validate the method we'd find in this potential sender // validate the method we'd find in this potential sender
if (!Method::is_valid_method(m)) return false; if (!Method::is_valid_method(m)) return false;

9
src/hotspot/share/runtime/frame.cpp
View File

@@ -52,6 +52,7 @@
#include "runtime/monitorChunk.hpp" #include "runtime/monitorChunk.hpp"
#include "runtime/os.hpp" #include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp" #include "runtime/sharedRuntime.hpp"
#include "runtime/safefetch.hpp"
#include "runtime/signature.hpp" #include "runtime/signature.hpp"
#include "runtime/stackValue.hpp" #include "runtime/stackValue.hpp"
#include "runtime/stubCodeGenerator.hpp" #include "runtime/stubCodeGenerator.hpp"
@@ -301,6 +302,14 @@ bool frame::is_entry_frame_valid(JavaThread* thread) const {
return (jfa->last_Java_sp() > sp()); return (jfa->last_Java_sp() > sp());
} }
Method* frame::safe_interpreter_frame_method() const {
Method** m_addr = interpreter_frame_method_addr();
if (m_addr == nullptr) {
return nullptr;
}
return (Method*) SafeFetchN((intptr_t*) m_addr, 0);
}
bool frame::should_be_deoptimized() const { bool frame::should_be_deoptimized() const {
if (_deopt_state == is_deoptimized || if (_deopt_state == is_deoptimized ||
!is_compiled_frame() ) return false; !is_compiled_frame() ) return false;

2
src/hotspot/share/runtime/frame.hpp
View File

@@ -236,6 +236,8 @@ class frame {
bool is_entry_frame_valid(JavaThread* thread) const; bool is_entry_frame_valid(JavaThread* thread) const;
Method* safe_interpreter_frame_method() const;
// All frames: // All frames:
// A low-level interface for vframes: // A low-level interface for vframes: