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 potential crash due to race condition #471

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix potential crash due to race condition #471

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
6 changes: 4 additions & 2 deletions ...shBlockMonitor/CrashBlockPlugin/Main/BlockMonitor/Handler/WCPowerConsumeStackCollector.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,9 @@ - (StackInfo)getStackInfoWithThreadCount:(mach_msg_type_number_t)cost_cpu_thread
}
}

ksmc_suspendEnvironment();
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
ksmc_suspendEnvironment(&threads, &numThreads);
for (int i = 0; i < cost_cpu_thread_count; i++) {
thread_t current_thread = cost_cpu_thread_list[i];
uintptr_t backtrace_buffer[maxEntries];
Expand All @@ -780,7 +782,7 @@ - (StackInfo)getStackInfoWithThreadCount:(mach_msg_type_number_t)cost_cpu_thread
}
}
}
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);

for (int i = 0; i < cost_cpu_thread_count; i++) {
if (async_stack_trace_array[i] != NULL && async_stack_trace_array_count[i] != 0) {
Expand Down
9 changes: 6 additions & 3 deletions ...iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Monitors/KSCrashMonitor_CPPException.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ void my_cxa_throw(void* thrown_exception, std::type_info* tinfo, void (*dest)(vo

static void CPPExceptionTerminate(void)
{
ksmc_suspendEnvironment();
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
ksmc_suspendEnvironment(&threads, &numThreads);

KSLOG_DEBUG("Trapped c++ exception");
const char* name = NULL;
std::type_info* tinfo = __cxxabiv1::__cxa_current_exception_type();
Expand Down Expand Up @@ -190,14 +193,14 @@ catch(TYPE value)\
ksTmpSingal.si_pid = (int)ksmc_getThreadFromContext(machineContext);

kscm_handleException(crashContext);
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);
kscm_innerHandleSignal(&ksTmpSingal);
kscm_handleSignal(&ksTmpSingal);
}
else
{
KSLOG_DEBUG("Detected NSException. Letting the current NSException handler deal with it.");
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);
}


Expand Down
6 changes: 4 additions & 2 deletions ...atrix-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Monitors/KSCrashMonitor_Deadlock.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ - (void) watchdogAnswer

- (void) handleDeadlock
{
ksmc_suspendEnvironment();
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
ksmc_suspendEnvironment(&threads, &numThreads);
kscm_notifyFatalExceptionCaptured(false);

KSMC_NEW_CONTEXT(machineContext);
Expand All @@ -127,7 +129,7 @@ - (void) handleDeadlock
crashContext->stackCursor = &stackCursor;

kscm_handleException(crashContext);
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);

KSLOG_DEBUG(@"Calling abort()");
abort();
Expand Down
6 changes: 4 additions & 2 deletions ...-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Monitors/KSCrashMonitor_MachException.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,9 @@ static void* handleExceptions(void* const userData)
exceptionMessage.code[0], exceptionMessage.code[1]);
if(g_isEnabled)
{
ksmc_suspendEnvironment();
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
ksmc_suspendEnvironment(&threads, &numThreads);
g_isHandlingCrash = true;
kscm_notifyFatalExceptionCaptured(true);

Expand Down Expand Up @@ -367,7 +369,7 @@ static void* handleExceptions(void* const userData)

KSLOG_DEBUG("Crash handling complete. Restoring original handlers.");
g_isHandlingCrash = false;
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);
kscm_innerHandleSignal(&ksTmpSingal);
kscm_handleSignal(&ksTmpSingal);
}
Expand Down
6 changes: 4 additions & 2 deletions ...ix-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Monitors/KSCrashMonitor_NSException.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ static void handleException(NSException* exception)
KSLOG_DEBUG(@"Trapped exception %@", exception);
if(g_isEnabled)
{
ksmc_suspendEnvironment();
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
ksmc_suspendEnvironment(&threads, &numThreads);
kscm_notifyFatalExceptionCaptured(false);

KSLOG_DEBUG(@"Filling out context.");
Expand Down Expand Up @@ -97,7 +99,7 @@ static void handleException(NSException* exception)

KSLOG_DEBUG(@"Calling main crash handler.");
kscm_handleException(crashContext);
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);
kscm_innerHandleSignal(&ksTmpSingal);
kscm_handleSignal(&ksTmpSingal);

Expand Down
6 changes: 4 additions & 2 deletions .../matrix-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Monitors/KSCrashMonitor_Signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ static void handleSignal(int sigNum, siginfo_t* signalInfo, void* userContext)
KSLOG_DEBUG("Trapped signal %d", sigNum);
if(g_isEnabled)
{
ksmc_suspendEnvironment();
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
ksmc_suspendEnvironment(&threads, &numThreads);
kscm_notifyFatalExceptionCaptured(false);

KSLOG_DEBUG("Filling out context.");
Expand All @@ -105,7 +107,7 @@ static void handleSignal(int sigNum, siginfo_t* signalInfo, void* userContext)
crashContext->stackCursor = &g_stackCursor;

kscm_handleException(crashContext);
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);
kscm_innerHandleSignal(signalInfo);
kscm_handleSignal(signalInfo);
}
Expand Down
12 changes: 8 additions & 4 deletions ...ix/matrix-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Monitors/KSCrashMonitor_User.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ void kscm_reportUserExceptionSelfDefinePath(const char* name,
}
else
{
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
if(logAllThreads)
{
ksmc_suspendEnvironment();
ksmc_suspendEnvironment(&threads, &numThreads);
}
if(terminateProgram)
{
Expand Down Expand Up @@ -91,7 +93,7 @@ void kscm_reportUserExceptionSelfDefinePath(const char* name,

if(logAllThreads)
{
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);
}
if(terminateProgram)
{
Expand All @@ -114,9 +116,11 @@ void kscm_reportUserException(const char* name,
}
else
{
thread_act_array_t threads = NULL;
mach_msg_type_number_t numThreads = 0;
if(logAllThreads)
{
ksmc_suspendEnvironment();
ksmc_suspendEnvironment(&threads, &numThreads);
}
if(terminateProgram)
{
Expand Down Expand Up @@ -149,7 +153,7 @@ void kscm_reportUserException(const char* name,

if(logAllThreads)
{
ksmc_resumeEnvironment();
ksmc_resumeEnvironment(threads, numThreads);
}
if(terminateProgram)
{
Expand Down
27 changes: 11 additions & 16 deletions matrix/matrix-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Tools/KSMachineContext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
static KSThread g_reservedThreads[10];
static int g_reservedThreadsMaxIndex = sizeof(g_reservedThreads) / sizeof(g_reservedThreads[0]) - 1;
static int g_reservedThreadsCount = 0;
static thread_act_array_t g_suspendedThreads = NULL;
static mach_msg_type_number_t g_suspendedThreadsCount = 0;


static inline bool isStackOverflow(const KSMachineContext* const context)
{
Expand Down Expand Up @@ -167,23 +164,23 @@ static inline bool isThreadInList(thread_t thread, KSThread* list, int listCount
}
#endif

void ksmc_suspendEnvironment()
void ksmc_suspendEnvironment(thread_act_array_t *suspendedThreads, mach_msg_type_number_t *numSuspendedThreads)
{
#if KSCRASH_HAS_THREADS_API
KSLOG_DEBUG("Suspending environment.");
kern_return_t kr;
const task_t thisTask = mach_task_self();
const thread_t thisThread = (thread_t)ksthread_self();

if((kr = task_threads(thisTask, &g_suspendedThreads, &g_suspendedThreadsCount)) != KERN_SUCCESS)
if((kr = task_threads(thisTask, suspendedThreads, numSuspendedThreads)) != KERN_SUCCESS)
{
KSLOG_ERROR("task_threads: %s", mach_error_string(kr));
return;
}

for(mach_msg_type_number_t i = 0; i < g_suspendedThreadsCount; i++)
for(mach_msg_type_number_t i = 0; i < *numSuspendedThreads; i++)
{
thread_t thread = g_suspendedThreads[i];
thread_t thread = (*suspendedThreads)[i];
if(thread != thisThread && !isThreadInList(thread, g_reservedThreads, g_reservedThreadsCount))
{
if((kr = thread_suspend(thread)) != KERN_SUCCESS)
Expand All @@ -198,23 +195,23 @@ void ksmc_suspendEnvironment()
#endif
}

void ksmc_resumeEnvironment()
void ksmc_resumeEnvironment(thread_act_array_t threads, mach_msg_type_number_t numThreads)
{
#if KSCRASH_HAS_THREADS_API
KSLOG_DEBUG("Resuming environment.");
kern_return_t kr;
const task_t thisTask = mach_task_self();
const thread_t thisThread = (thread_t)ksthread_self();

if(g_suspendedThreads == NULL || g_suspendedThreadsCount == 0)
if(threads == NULL || numThreads == 0)
{
KSLOG_ERROR("we should call ksmc_suspendEnvironment() first");
return;
}

for(mach_msg_type_number_t i = 0; i < g_suspendedThreadsCount; i++)
for(mach_msg_type_number_t i = 0; i < numThreads; i++)
{
thread_t thread = g_suspendedThreads[i];
thread_t thread = threads[i];
if(thread != thisThread && !isThreadInList(thread, g_reservedThreads, g_reservedThreadsCount))
{
if((kr = thread_resume(thread)) != KERN_SUCCESS)
Expand All @@ -225,13 +222,11 @@ void ksmc_resumeEnvironment()
}
}

for(mach_msg_type_number_t i = 0; i < g_suspendedThreadsCount; i++)
for(mach_msg_type_number_t i = 0; i < numThreads; i++)
{
mach_port_deallocate(thisTask, g_suspendedThreads[i]);
mach_port_deallocate(thisTask, threads[i]);
}
vm_deallocate(thisTask, (vm_address_t)g_suspendedThreads, sizeof(thread_t) * g_suspendedThreadsCount);
g_suspendedThreads = NULL;
g_suspendedThreadsCount = 0;
vm_deallocate(thisTask, (vm_address_t)threads, sizeof(thread_t) * numThreads);

KSLOG_DEBUG("Resume complete.");
#endif
Expand Down
5 changes: 3 additions & 2 deletions matrix/matrix-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Tools/KSMachineContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ extern "C" {

#include "KSThread.h"
#include <stdbool.h>
#include <mach/mach.h>

/** Suspend the runtime environment.
*/
void ksmc_suspendEnvironment(void);
void ksmc_suspendEnvironment(thread_act_array_t *suspendedThreads, mach_msg_type_number_t *numSuspendedThreads);

/** Resume the runtime environment.
*/
void ksmc_resumeEnvironment(void);
void ksmc_resumeEnvironment(thread_act_array_t threads, mach_msg_type_number_t numThreads);

/** Create a new machine context on the stack.
* This macro creates a storage object on the stack, as well as a pointer of type
Expand Down