pm/cfg: simplify initial process id range logic

This commit is contained in:
Michael Scire 2021-10-01 17:37:39 -07:00
parent 28756234d9
commit 4390df76ad

View File

@ -19,66 +19,42 @@ namespace ams::cfg {
namespace { namespace {
/* Convenience definitions. */
constexpr os::ProcessId InitialProcessIdMinDeprecated = {0x00};
constexpr os::ProcessId InitialProcessIdMaxDeprecated = {0x50};
/* Privileged process globals. */
constinit os::SdkMutex g_lock; constinit os::SdkMutex g_lock;
constinit bool g_got_privileged_process_status = false; constinit bool g_got_privileged_process_status = false;
constinit os::ProcessId g_min_initial_process_id = os::InvalidProcessId, g_max_initial_process_id = os::InvalidProcessId; constinit os::ProcessId g_min_initial_process_id = os::InvalidProcessId, g_max_initial_process_id = os::InvalidProcessId;
constinit os::ProcessId g_cur_process_id = os::InvalidProcessId; constinit os::ProcessId g_cur_process_id = os::InvalidProcessId;
/* SD card helpers. */ ALWAYS_INLINE void EnsurePrivilegedProcessStatusCached() {
void GetPrivilegedProcessIdRange(os::ProcessId *out_min, os::ProcessId *out_max) { if (AMS_LIKELY(g_got_privileged_process_status)) {
os::ProcessId min = os::InvalidProcessId, max = os::InvalidProcessId; return;
if (hos::GetVersion() >= hos::Version_5_0_0) {
/* On 5.0.0+, we can get precise limits from svcGetSystemInfo. */
R_ABORT_UNLESS(svcGetSystemInfo(reinterpret_cast<u64 *>(&min), SystemInfoType_InitialProcessIdRange, INVALID_HANDLE, InitialProcessIdRangeInfo_Minimum));
R_ABORT_UNLESS(svcGetSystemInfo(reinterpret_cast<u64 *>(&max), SystemInfoType_InitialProcessIdRange, INVALID_HANDLE, InitialProcessIdRangeInfo_Maximum));
} else if (hos::GetVersion() >= hos::Version_4_0_0) {
/* On 4.0.0-4.1.0, we can get the precise limits from normal svcGetInfo. */
R_ABORT_UNLESS(svcGetInfo(reinterpret_cast<u64 *>(&min), InfoType_InitialProcessIdRange, INVALID_HANDLE, InitialProcessIdRangeInfo_Minimum));
R_ABORT_UNLESS(svcGetInfo(reinterpret_cast<u64 *>(&max), InfoType_InitialProcessIdRange, INVALID_HANDLE, InitialProcessIdRangeInfo_Maximum));
} else {
/* On < 4.0.0, we just use hardcoded extents. */
min = InitialProcessIdMinDeprecated;
max = InitialProcessIdMaxDeprecated;
} }
*out_min = min; std::scoped_lock lk(g_lock);
*out_max = max;
}
void GetPrivilegedProcessStatus() { if (AMS_LIKELY(!g_got_privileged_process_status)) {
GetPrivilegedProcessIdRange(&g_min_initial_process_id, &g_max_initial_process_id); R_ABORT_UNLESS(svc::GetSystemInfo(std::addressof(g_min_initial_process_id.value), svc::SystemInfoType_InitialProcessIdRange, svc::InvalidHandle, svc::InitialProcessIdRangeInfo_Minimum));
g_cur_process_id = os::GetCurrentProcessId(); R_ABORT_UNLESS(svc::GetSystemInfo(std::addressof(g_max_initial_process_id.value), svc::SystemInfoType_InitialProcessIdRange, svc::InvalidHandle, svc::InitialProcessIdRangeInfo_Maximum));
g_got_privileged_process_status = true; g_cur_process_id = os::GetCurrentProcessId();
g_got_privileged_process_status = true;
}
} }
} }
/* Privileged Process utilities. */
bool IsInitialProcess() { bool IsInitialProcess() {
std::scoped_lock lk(g_lock); /* Cache initial process range and extents. */
EnsurePrivilegedProcessStatusCached();
/* If we've not detected, do detection. */ /* Determine if we're Initial. */
if (!g_got_privileged_process_status) {
GetPrivilegedProcessStatus();
}
/* Determine if we're privileged, and return. */
return g_min_initial_process_id <= g_cur_process_id && g_cur_process_id <= g_max_initial_process_id; return g_min_initial_process_id <= g_cur_process_id && g_cur_process_id <= g_max_initial_process_id;
} }
void GetInitialProcessRange(os::ProcessId *out_min, os::ProcessId *out_max) { void GetInitialProcessRange(os::ProcessId *out_min, os::ProcessId *out_max) {
std::scoped_lock lk(g_lock); /* Cache initial process range and extents. */
EnsurePrivilegedProcessStatusCached();
/* If we've not detected, do detection. */
if (!g_got_privileged_process_status) {
GetPrivilegedProcessStatus();
}
/* Set output. */
*out_min = g_min_initial_process_id; *out_min = g_min_initial_process_id;
*out_max = g_max_initial_process_id; *out_max = g_max_initial_process_id;
} }