mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-21 10:53:23 +02:00
Threads: Check the process' resource limit for the max allowed priority when creating a thread and remove the priority clamping code.
This commit is contained in:
parent
f2f2572fed
commit
1ddff14511
@ -353,14 +353,8 @@ static void ResetThreadContext(ARM_Interface::ThreadContext& context, u32 stack_
|
|||||||
|
|
||||||
ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point, s32 priority,
|
ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point, s32 priority,
|
||||||
u32 arg, s32 processor_id, VAddr stack_top) {
|
u32 arg, s32 processor_id, VAddr stack_top) {
|
||||||
if (priority < THREADPRIO_HIGHEST || priority > THREADPRIO_LOWEST) {
|
ASSERT_MSG(priority >= THREADPRIO_HIGHEST && priority <= THREADPRIO_LOWEST,
|
||||||
s32 new_priority = MathUtil::Clamp<s32>(priority, THREADPRIO_HIGHEST, THREADPRIO_LOWEST);
|
"Invalid thread priority");
|
||||||
LOG_WARNING(Kernel_SVC, "(name=%s): invalid priority=%d, clamping to %d", name.c_str(),
|
|
||||||
priority, new_priority);
|
|
||||||
// TODO(bunnei): Clamping to a valid priority is not necessarily correct behavior... Confirm
|
|
||||||
// validity of this
|
|
||||||
priority = new_priority;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Memory::IsValidVirtualAddress(entry_point)) {
|
if (!Memory::IsValidVirtualAddress(entry_point)) {
|
||||||
LOG_ERROR(Kernel_SVC, "(name=%s): invalid entry %08x", name.c_str(), entry_point);
|
LOG_ERROR(Kernel_SVC, "(name=%s): invalid entry %08x", name.c_str(), entry_point);
|
||||||
|
@ -532,16 +532,18 @@ static ResultCode CreateThread(Kernel::Handle* out_handle, s32 priority, u32 ent
|
|||||||
name = Common::StringFromFormat("unknown-%08x", entry_point);
|
name = Common::StringFromFormat("unknown-%08x", entry_point);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(bunnei): Implement resource limits to return an error code instead of the below assert.
|
|
||||||
// The error code should be: Description::NotAuthorized, Module::OS, Summary::WrongArgument,
|
|
||||||
// Level::Permanent
|
|
||||||
ASSERT_MSG(priority >= THREADPRIO_USERLAND_MAX, "Unexpected thread priority!");
|
|
||||||
|
|
||||||
if (priority > THREADPRIO_LOWEST) {
|
if (priority > THREADPRIO_LOWEST) {
|
||||||
return ResultCode(ErrorDescription::OutOfRange, ErrorModule::OS,
|
return ResultCode(ErrorDescription::OutOfRange, ErrorModule::OS,
|
||||||
ErrorSummary::InvalidArgument, ErrorLevel::Usage);
|
ErrorSummary::InvalidArgument, ErrorLevel::Usage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
using Kernel::ResourceLimit;
|
||||||
|
Kernel::SharedPtr<ResourceLimit>& resource_limit = Kernel::g_current_process->resource_limit;
|
||||||
|
if (resource_limit->GetMaxResourceValue(Kernel::ResourceTypes::PRIORITY) > priority) {
|
||||||
|
return ResultCode(ErrorDescription::NotAuthorized, ErrorModule::OS,
|
||||||
|
ErrorSummary::WrongArgument, ErrorLevel::Permanent);
|
||||||
|
}
|
||||||
|
|
||||||
switch (processor_id) {
|
switch (processor_id) {
|
||||||
case THREADPROCESSORID_ALL:
|
case THREADPROCESSORID_ALL:
|
||||||
case THREADPROCESSORID_DEFAULT:
|
case THREADPROCESSORID_DEFAULT:
|
||||||
|
Loading…
Reference in New Issue
Block a user