Skip to content
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

Fix use-after-free in exception replay #2947

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Fix use-after-free in exception replay #2947

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions ext/exception_serialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,8 @@ static void ddtrace_collect_exception_debug_data(zend_object *exception, zend_st

add_meta(context, DDTRACE_STRING_LITERAL("_dd.debug.error.exception_capture_id"), (ddtrace_string){exception_id, uuid_len});

memset(&DDTRACE_G(exception_debugger_buffer), 0, sizeof(DDTRACE_G(exception_debugger_buffer)));

zval *frame;
int frame_num = 0;
ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARR_P(trace), frame_num, frame) {
Expand Down Expand Up @@ -470,6 +472,13 @@ static void ddtrace_collect_exception_debug_data(zend_object *exception, zend_st
}
}

// Note: We MUST immediately send this, and not defer, as stuff may be freed during span processing. Including stuff potentially contained within the exception debugger payload.
ddtrace_sidecar_send_debugger_data(DDTRACE_G(exception_debugger_buffer));
if (DDTRACE_G(debugger_capture_arena)) {
zend_arena_destroy(DDTRACE_G(debugger_capture_arena));
DDTRACE_G(debugger_capture_arena) = NULL;
}

zend_string_release(key_locals);
}

Expand Down
10 changes: 0 additions & 10 deletions ext/span.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,6 @@ void ddtrace_drop_span(ddtrace_span_data *span) {

void ddtrace_serialize_closed_spans(zval *serialized) {
if (DDTRACE_G(top_closed_stack)) {
memset(&DDTRACE_G(exception_debugger_buffer), 0, sizeof(DDTRACE_G(exception_debugger_buffer)));

ddtrace_span_stack *rootstack = DDTRACE_G(top_closed_stack);
DDTRACE_G(top_closed_stack) = NULL;
do {
Expand Down Expand Up @@ -759,14 +757,6 @@ void ddtrace_serialize_closed_spans(zval *serialized) {
}
} while (stack);
} while (rootstack);

if (ddtrace_exception_debugging_is_active()) {
ddtrace_sidecar_send_debugger_data(DDTRACE_G(exception_debugger_buffer));
if (DDTRACE_G(debugger_capture_arena)) {
zend_arena_destroy(DDTRACE_G(debugger_capture_arena));
DDTRACE_G(debugger_capture_arena) = NULL;
}
}
}

// Reset closed span counter for limit-refresh, don't touch open spans
Expand Down
Loading