nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-10 07:06:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

kern: ensure handle table is finalized when deferring termination

Browse source
This commit is contained in:
Michael Scire 2021-04-07 15:16:11 -07:00 committed by SciresM
parent 911e431d65
commit afb1d68d06
2 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/libmesosphere/include/mesosphere/kern_k_process.hpp
View file

@ -100,6 +100,7 @@ namespace ams::kern {
bool m_is_suspended{}; bool m_is_suspended{};
bool m_is_immortal{}; bool m_is_immortal{};
bool m_is_jit_debug{}; bool m_is_jit_debug{};
bool m_is_handle_table_initialized{};
ams::svc::DebugEvent m_jit_debug_event_type{}; ams::svc::DebugEvent m_jit_debug_event_type{};
ams::svc::DebugException m_jit_debug_exception_type{}; ams::svc::DebugException m_jit_debug_exception_type{};
uintptr_t m_jit_debug_params[4]{}; uintptr_t m_jit_debug_params[4]{};
@ -404,6 +405,23 @@ namespace ams::kern {
this->NotifyAvailable(); this->NotifyAvailable();
} }
} }
ALWAYS_INLINE Result InitializeHandleTable(s32 size) {
/* Try to initialize the handle table. */
R_TRY(m_handle_table.Initialize(size));
/* We succeeded, so note that we did. */
m_is_handle_table_initialized = true;
return ResultSuccess();
}
ALWAYS_INLINE void FinalizeHandleTable() {
/* Finalize the table. */
m_handle_table.Finalize();
/* Note that the table is finalized. */
m_is_handle_table_initialized = false;
}
}; };
} }

36
libraries/libmesosphere/source/kern_k_process.cpp
View file

@ -211,19 +211,20 @@ namespace ams::kern {
KSystemControl::GenerateRandomBytes(m_entropy, sizeof(m_entropy)); KSystemControl::GenerateRandomBytes(m_entropy, sizeof(m_entropy));
/* Clear remaining fields. */ /* Clear remaining fields. */
m_num_running_threads = 0; m_num_running_threads = 0;
m_num_process_switches = 0; m_num_process_switches = 0;
m_num_thread_switches = 0; m_num_thread_switches = 0;
m_num_fpu_switches = 0; m_num_fpu_switches = 0;
m_num_supervisor_calls = 0; m_num_supervisor_calls = 0;
m_num_ipc_messages = 0; m_num_ipc_messages = 0;
m_is_signaled = false; m_is_signaled = false;
m_attached_object = nullptr; m_attached_object = nullptr;
m_exception_thread = nullptr; m_exception_thread = nullptr;
m_is_suspended = false; m_is_suspended = false;
m_memory_release_hint = 0; m_memory_release_hint = 0;
m_schedule_count = 0; m_schedule_count = 0;
m_is_handle_table_initialized = false;
/* We're initialized! */ /* We're initialized! */
m_is_initialized = true; m_is_initialized = true;
@ -400,6 +401,11 @@ namespace ams::kern {
/* Terminate child threads. */ /* Terminate child threads. */
TerminateChildren(this, nullptr); TerminateChildren(this, nullptr);
/* Finalize the handle table, if we're not immortal. */
if (!m_is_immortal && m_is_handle_table_initialized) {
this->FinalizeHandleTable();
}
/* Call the debug callback. */ /* Call the debug callback. */
KDebug::OnExitProcess(this); KDebug::OnExitProcess(this);
@ -411,7 +417,7 @@ namespace ams::kern {
/* Finalize the handle table when we're done, if the process isn't immortal. */ /* Finalize the handle table when we're done, if the process isn't immortal. */
ON_SCOPE_EXIT { ON_SCOPE_EXIT {
if (!m_is_immortal) { if (!m_is_immortal) {
m_handle_table.Finalize(); this->FinalizeHandleTable();
} }
}; };
@ -905,8 +911,8 @@ namespace ams::kern {
R_TRY(m_page_table.SetMaxHeapSize(m_max_process_memory - (m_main_thread_stack_size + m_code_size))); R_TRY(m_page_table.SetMaxHeapSize(m_max_process_memory - (m_main_thread_stack_size + m_code_size)));
/* Initialize our handle table. */ /* Initialize our handle table. */
R_TRY(m_handle_table.Initialize(m_capabilities.GetHandleTableSize())); R_TRY(this->InitializeHandleTable(m_capabilities.GetHandleTableSize()));
auto ht_guard = SCOPE_GUARD { m_handle_table.Finalize(); }; auto ht_guard = SCOPE_GUARD { this->FinalizeHandleTable(); };
/* Create a new thread for the process. */ /* Create a new thread for the process. */
KThread *main_thread = KThread::Create(); KThread *main_thread = KThread::Create();