Skip to content

Fix ASan heap-buffer-overflow in signal handlers #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbachorik merged 1 commit into from
Jan 23, 2026
+7 −6
Merged

Fix ASan heap-buffer-overflow in signal handlers #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ddprof-lib/src/main/cpp/vmStructs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <string.h>
#include <type_traits>
#include "codeCache.h"
#include "safeAccess.h"


class VMStructs {
Expand Down Expand Up @@ -311,23 +312,23 @@ class JavaFrameAnchor : VMStructs {

public:
static JavaFrameAnchor* fromEntryFrame(uintptr_t fp) {
const char* call_wrapper = *(const char**)(fp + _entry_frame_call_wrapper_offset);
const char* call_wrapper = (const char*) SafeAccess::loadPtr((void**)(fp + _entry_frame_call_wrapper_offset), nullptr);
if (!goodPtr(call_wrapper) || (uintptr_t)call_wrapper - fp > MAX_CALL_WRAPPER_DISTANCE) {
return NULL;
}
return (JavaFrameAnchor*)(call_wrapper + _call_wrapper_anchor_offset);
}

uintptr_t lastJavaSP() {
return *(uintptr_t*) at(_anchor_sp_offset);
return (uintptr_t) SafeAccess::loadPtr((void**) at(_anchor_sp_offset), nullptr);
}

uintptr_t lastJavaFP() {
return *(uintptr_t*) at(_anchor_fp_offset);
return (uintptr_t) SafeAccess::loadPtr((void**) at(_anchor_fp_offset), nullptr);
}

const void* lastJavaPC() {
return *(const void**) at(_anchor_pc_offset);
return SafeAccess::loadPtr((void**) at(_anchor_pc_offset), nullptr);
}

void setLastJavaPC(const void* pc) {
Expand Down Expand Up @@ -382,15 +383,15 @@ class VMThread : VMStructs {
}

int state() {
return _thread_state_offset >= 0 ? *(int*) at(_thread_state_offset) : 0;
return _thread_state_offset >= 0 ? SafeAccess::load32((int32_t*) at(_thread_state_offset), 0) : 0;
}

bool inJava() {
return state() == 8;
}

bool inDeopt() {
return *(void**) at(_thread_vframe_offset) != NULL;
return SafeAccess::loadPtr((void**) at(_thread_vframe_offset), nullptr) != NULL;
}

void*& exception() {
Expand Down
Loading