stratosphere: Fix fs.mitm bis_protect race condition.

This commit is contained in:
Michael Scire
2018-11-30 02:42:48 -08:00
parent bcdfc53d7d
commit 49ad66e478
9 changed files with 41 additions and 10 deletions

View File

@@ -31,3 +31,7 @@ void ManagerService::AtmosphereEndInitDefers() {
Registration::EndInitDefers();
}
void ManagerService::AtmosphereHasMitm(Out<bool> out, SmServiceName service) {
out.SetValue(Registration::HasMitm(smEncodeName(service.name)));
}

View File

@@ -17,6 +17,7 @@
#pragma once
#include <switch.h>
#include <stratosphere.hpp>
#include "sm_types.hpp"
enum ManagerServiceCmd {
Manager_Cmd_RegisterProcess = 0,
@@ -24,6 +25,7 @@ enum ManagerServiceCmd {
Manager_Cmd_AtmosphereEndInitDefers = 65000,
Manager_Cmd_AtmosphereHasMitm = 65001,
};
class ManagerService final : public IServiceObject {
@@ -32,11 +34,13 @@ class ManagerService final : public IServiceObject {
virtual Result RegisterProcess(u64 pid, InBuffer<u8> acid_sac, InBuffer<u8> aci0_sac);
virtual Result UnregisterProcess(u64 pid);
virtual void AtmosphereEndInitDefers();
virtual void AtmosphereHasMitm(Out<bool> out, SmServiceName service);
public:
DEFINE_SERVICE_DISPATCH_TABLE {
MakeServiceCommandMeta<Manager_Cmd_RegisterProcess, &ManagerService::RegisterProcess>(),
MakeServiceCommandMeta<Manager_Cmd_UnregisterProcess, &ManagerService::UnregisterProcess>(),
MakeServiceCommandMeta<Manager_Cmd_AtmosphereEndInitDefers, &ManagerService::AtmosphereEndInitDefers>(),
MakeServiceCommandMeta<Manager_Cmd_AtmosphereHasMitm, &ManagerService::AtmosphereHasMitm>(),
};
};

View File

@@ -180,6 +180,9 @@ bool Registration::IsInitialProcess(u64 pid) {
u64 Registration::GetInitialProcessId() {
CacheInitialProcessIdLimits();
if (IsInitialProcess(1)) {
return 1;
}
return g_initial_process_id_low;
}
@@ -219,6 +222,11 @@ bool Registration::HasService(u64 service) {
return std::any_of(g_service_list.begin(), g_service_list.end(), member_equals_fn(&Service::service_name, service));
}
bool Registration::HasMitm(u64 service) {
Registration::Service *target_service = GetService(service);
return target_service != NULL && target_service->mitm_pid != 0;
}
Result Registration::GetServiceHandle(u64 pid, u64 service, Handle *out) {
Registration::Service *target_service = GetService(service);
if (target_service == NULL || ShouldInitDefer(service) || target_service->mitm_waiting_ack) {

View File

@@ -69,6 +69,7 @@ class Registration {
/* Service management. */
static bool HasService(u64 service);
static bool HasMitm(u64 service);
static Result GetServiceHandle(u64 pid, u64 service, Handle *out);
static Result GetServiceForPid(u64 pid, u64 service, Handle *out);
static Result RegisterServiceForPid(u64 pid, u64 service, u64 max_sessions, bool is_light, Handle *out);