mitm/cfg: pass around override status for decision-making
This commit is contained in:
@@ -31,10 +31,6 @@ namespace ams::ldr {
|
||||
/* Globals. */
|
||||
bool g_has_mounted_sd_card = false;
|
||||
|
||||
ncm::ProgramId g_should_override_program_id;
|
||||
bool g_should_override_hbl = false;
|
||||
bool g_should_override_sd = false;
|
||||
|
||||
/* Helpers. */
|
||||
inline void FixFileSystemPath(char *path) {
|
||||
/* Paths will fail when passed to FS if they use the wrong kinds of slashes. */
|
||||
@@ -53,27 +49,6 @@ namespace ams::ldr {
|
||||
return relative_path;
|
||||
}
|
||||
|
||||
void UpdateShouldOverrideCache(ncm::ProgramId program_id) {
|
||||
if (g_should_override_program_id != program_id) {
|
||||
cfg::GetOverrideKeyHeldStatus(&g_should_override_hbl, &g_should_override_sd, program_id);
|
||||
}
|
||||
g_should_override_program_id = program_id;
|
||||
}
|
||||
|
||||
void InvalidateShouldOverrideCache() {
|
||||
g_should_override_program_id = {};
|
||||
}
|
||||
|
||||
bool ShouldOverrideWithHbl(ncm::ProgramId program_id) {
|
||||
UpdateShouldOverrideCache(program_id);
|
||||
return g_should_override_hbl;
|
||||
}
|
||||
|
||||
bool ShouldOverrideWithSd(ncm::ProgramId program_id) {
|
||||
UpdateShouldOverrideCache(program_id);
|
||||
return g_should_override_sd;
|
||||
}
|
||||
|
||||
Result MountSdCardFileSystem() {
|
||||
return fsdevMountSdmc();
|
||||
}
|
||||
@@ -109,14 +84,14 @@ namespace ams::ldr {
|
||||
return OpenFile(SdCardFileSystemDeviceName, path);
|
||||
}
|
||||
|
||||
bool IsFileStubbed(ncm::ProgramId program_id, const char *relative_path) {
|
||||
bool IsFileStubbed(ncm::ProgramId program_id, const cfg::OverrideStatus &status, const char *relative_path) {
|
||||
/* Allow nullptr relative path -- those are simply not openable. */
|
||||
if (relative_path == nullptr) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Only allow stubbing in the case where we're considering SD card content. */
|
||||
if (!ShouldOverrideWithSd(program_id)) {
|
||||
if (!status.IsProgramSpecific()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -131,14 +106,14 @@ namespace ams::ldr {
|
||||
return true;
|
||||
}
|
||||
|
||||
FILE *OpenBaseExefsFile(ncm::ProgramId program_id, const char *relative_path) {
|
||||
FILE *OpenBaseExefsFile(ncm::ProgramId program_id, const cfg::OverrideStatus &status, const char *relative_path) {
|
||||
/* Allow nullptr relative path -- those are simply not openable. */
|
||||
if (relative_path == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
/* Check if stubbed. */
|
||||
if (IsFileStubbed(program_id, relative_path)) {
|
||||
if (IsFileStubbed(program_id, status, relative_path)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@@ -148,7 +123,11 @@ namespace ams::ldr {
|
||||
}
|
||||
|
||||
/* ScopedCodeMount functionality. */
|
||||
ScopedCodeMount::ScopedCodeMount(const ncm::ProgramLocation &loc) : is_code_mounted(false), is_hbl_mounted(false) {
|
||||
ScopedCodeMount::ScopedCodeMount(const ncm::ProgramLocation &loc) : has_status(false), is_code_mounted(false), is_hbl_mounted(false) {
|
||||
this->result = this->Initialize(loc);
|
||||
}
|
||||
|
||||
ScopedCodeMount::ScopedCodeMount(const ncm::ProgramLocation &loc, const cfg::OverrideStatus &o) : override_status(o), has_status(true), is_code_mounted(false), is_hbl_mounted(false) {
|
||||
this->result = this->Initialize(loc);
|
||||
}
|
||||
|
||||
@@ -160,9 +139,6 @@ namespace ams::ldr {
|
||||
if (this->is_hbl_mounted) {
|
||||
fsdevUnmountDevice(HblFileSystemDeviceName);
|
||||
}
|
||||
|
||||
/* Unmounting code means we should invalidate our configuration cache. */
|
||||
InvalidateShouldOverrideCache();
|
||||
}
|
||||
|
||||
Result ScopedCodeMount::MountCodeFileSystem(const ncm::ProgramLocation &loc) {
|
||||
@@ -219,12 +195,17 @@ namespace ams::ldr {
|
||||
}
|
||||
}
|
||||
|
||||
/* Capture override status, if necessary. */
|
||||
if (!this->has_status) {
|
||||
this->InitializeOverrideStatus(loc);
|
||||
}
|
||||
|
||||
/* Check if we should override contents. */
|
||||
if (ShouldOverrideWithHbl(loc.program_id)) {
|
||||
if (this->override_status.IsHbl()) {
|
||||
/* Try to mount HBL. */
|
||||
this->MountHblFileSystem();
|
||||
}
|
||||
if (ShouldOverrideWithSd(loc.program_id)) {
|
||||
if (this->override_status.IsProgramSpecific()) {
|
||||
/* Try to mount Code NSP on SD. */
|
||||
this->MountSdCardCodeFileSystem(loc);
|
||||
}
|
||||
@@ -237,25 +218,31 @@ namespace ams::ldr {
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
Result OpenCodeFile(FILE *&out, ncm::ProgramId program_id, const char *relative_path) {
|
||||
void ScopedCodeMount::InitializeOverrideStatus(const ncm::ProgramLocation &loc) {
|
||||
AMS_ASSERT(!this->has_status);
|
||||
this->override_status = cfg::CaptureOverrideStatus(loc.program_id);
|
||||
this->has_status = true;
|
||||
}
|
||||
|
||||
Result OpenCodeFile(FILE *&out, ncm::ProgramId program_id, const cfg::OverrideStatus &status, const char *relative_path) {
|
||||
FILE *f = nullptr;
|
||||
const char *ecs_device_name = ecs::Get(program_id);
|
||||
|
||||
if (ecs_device_name != nullptr) {
|
||||
/* First priority: Open from external content. */
|
||||
f = OpenFile(ecs_device_name, relative_path);
|
||||
} else if (ShouldOverrideWithHbl(program_id)) {
|
||||
} else if (status.IsHbl()) {
|
||||
/* Next, try to open from HBL. */
|
||||
f = OpenFile(HblFileSystemDeviceName, relative_path);
|
||||
} else {
|
||||
/* If not ECS or HBL, try a loose file on the SD. */
|
||||
if (ShouldOverrideWithSd(program_id)) {
|
||||
if (status.IsProgramSpecific()) {
|
||||
f = OpenLooseSdFile(program_id, relative_path);
|
||||
}
|
||||
|
||||
/* If we fail, try the original exefs. */
|
||||
if (f == nullptr) {
|
||||
f = OpenBaseExefsFile(program_id, relative_path);
|
||||
f = OpenBaseExefsFile(program_id, status, relative_path);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -266,9 +253,9 @@ namespace ams::ldr {
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
Result OpenCodeFileFromBaseExefs(FILE *&out, ncm::ProgramId program_id, const char *relative_path) {
|
||||
Result OpenCodeFileFromBaseExefs(FILE *&out, ncm::ProgramId program_id, const cfg::OverrideStatus &status, const char *relative_path) {
|
||||
/* Open the file. */
|
||||
FILE *f = OpenBaseExefsFile(program_id, relative_path);
|
||||
FILE *f = OpenBaseExefsFile(program_id, status, relative_path);
|
||||
R_UNLESS(f != nullptr, fs::ResultPathNotFound());
|
||||
|
||||
out = f;
|
||||
|
||||
@@ -23,10 +23,13 @@ namespace ams::ldr {
|
||||
NON_COPYABLE(ScopedCodeMount);
|
||||
private:
|
||||
Result result;
|
||||
cfg::OverrideStatus override_status;
|
||||
bool has_status;
|
||||
bool is_code_mounted;
|
||||
bool is_hbl_mounted;
|
||||
public:
|
||||
ScopedCodeMount(const ncm::ProgramLocation &loc);
|
||||
ScopedCodeMount(const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status);
|
||||
~ScopedCodeMount();
|
||||
|
||||
Result GetResult() const {
|
||||
@@ -41,17 +44,24 @@ namespace ams::ldr {
|
||||
return this->is_hbl_mounted;
|
||||
}
|
||||
|
||||
const cfg::OverrideStatus &GetOverrideStatus() const {
|
||||
AMS_ASSERT(this->has_status);
|
||||
return this->override_status;
|
||||
}
|
||||
|
||||
private:
|
||||
Result Initialize(const ncm::ProgramLocation &loc);
|
||||
|
||||
void InitializeOverrideStatus(const ncm::ProgramLocation &loc);
|
||||
|
||||
Result MountCodeFileSystem(const ncm::ProgramLocation &loc);
|
||||
Result MountSdCardCodeFileSystem(const ncm::ProgramLocation &loc);
|
||||
Result MountHblFileSystem();
|
||||
};
|
||||
|
||||
/* Content Management API. */
|
||||
Result OpenCodeFile(FILE *&out, ncm::ProgramId program_id, const char *relative_path);
|
||||
Result OpenCodeFileFromBaseExefs(FILE *&out, ncm::ProgramId program_id, const char *relative_path);
|
||||
Result OpenCodeFile(FILE *&out, ncm::ProgramId program_id, const cfg::OverrideStatus &status, const char *relative_path);
|
||||
Result OpenCodeFileFromBaseExefs(FILE *&out, ncm::ProgramId program_id, const cfg::OverrideStatus &status, const char *relative_path);
|
||||
|
||||
/* Redirection API. */
|
||||
Result ResolveContentPath(char *out_path, const ncm::ProgramLocation &loc);
|
||||
|
||||
@@ -23,46 +23,60 @@
|
||||
|
||||
namespace ams::ldr {
|
||||
|
||||
namespace {
|
||||
|
||||
Result GetProgramInfoImpl(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc) {
|
||||
/* Zero output. */
|
||||
std::memset(out, 0, sizeof(*out));
|
||||
cfg::OverrideStatus status = {};
|
||||
|
||||
R_TRY(ldr::GetProgramInfo(out, &status, loc));
|
||||
|
||||
if (loc.storage_id != static_cast<u8>(ncm::StorageId::None) && loc.program_id != out->program_id) {
|
||||
char path[FS_MAX_PATH];
|
||||
const ncm::ProgramLocation new_loc = ncm::ProgramLocation::Make(out->program_id, static_cast<ncm::StorageId>(loc.storage_id));
|
||||
|
||||
R_TRY(ResolveContentPath(path, loc));
|
||||
R_TRY(RedirectContentPath(path, new_loc));
|
||||
|
||||
const auto arg_info = args::Get(loc.program_id);
|
||||
if (arg_info != nullptr) {
|
||||
R_TRY(args::Set(new_loc.program_id, arg_info->args, arg_info->args_size));
|
||||
}
|
||||
}
|
||||
|
||||
if (out_status != nullptr) {
|
||||
*out_status = status;
|
||||
}
|
||||
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Official commands. */
|
||||
Result LoaderService::CreateProcess(sf::OutMoveHandle proc_h, PinId id, u32 flags, sf::CopyHandle reslimit_h) {
|
||||
os::ManagedHandle reslimit_holder(reslimit_h.GetValue());
|
||||
ncm::ProgramLocation loc;
|
||||
cfg::OverrideStatus override_status;
|
||||
char path[FS_MAX_PATH];
|
||||
|
||||
/* Get location. */
|
||||
R_TRY(ldr::ro::GetProgramLocation(&loc, id));
|
||||
/* Get location and override status. */
|
||||
R_TRY(ldr::ro::GetProgramLocationAndStatus(&loc, &override_status, id));
|
||||
|
||||
if (loc.storage_id != static_cast<u8>(ncm::StorageId::None)) {
|
||||
R_TRY(ResolveContentPath(path, loc));
|
||||
}
|
||||
|
||||
return ldr::CreateProcess(proc_h.GetHandlePointer(), id, loc, path, flags, reslimit_holder.Get());
|
||||
return ldr::CreateProcess(proc_h.GetHandlePointer(), id, loc, override_status, path, flags, reslimit_holder.Get());
|
||||
}
|
||||
|
||||
Result LoaderService::GetProgramInfo(sf::Out<ProgramInfo> out, const ncm::ProgramLocation &loc) {
|
||||
/* Zero output. */
|
||||
std::memset(out.GetPointer(), 0, sizeof(*out.GetPointer()));
|
||||
|
||||
R_TRY(ldr::GetProgramInfo(out.GetPointer(), loc));
|
||||
|
||||
if (loc.storage_id != static_cast<u8>(ncm::StorageId::None) && loc.program_id != out->program_id) {
|
||||
char path[FS_MAX_PATH];
|
||||
const ncm::ProgramLocation new_loc = ncm::ProgramLocation::Make(out->program_id, static_cast<ncm::StorageId>(loc.storage_id));
|
||||
|
||||
R_TRY(ResolveContentPath(path, loc));
|
||||
R_TRY(RedirectContentPath(path, new_loc));
|
||||
|
||||
const auto arg_info = args::Get(loc.program_id);
|
||||
if (arg_info != nullptr) {
|
||||
R_TRY(args::Set(new_loc.program_id, arg_info->args, arg_info->args_size));
|
||||
}
|
||||
}
|
||||
|
||||
return ResultSuccess();
|
||||
return GetProgramInfoImpl(out.GetPointer(), nullptr, loc);
|
||||
}
|
||||
|
||||
Result LoaderService::PinProgram(sf::Out<PinId> out_id, const ncm::ProgramLocation &loc) {
|
||||
return ldr::ro::PinProgram(out_id.GetPointer(), loc);
|
||||
return ldr::ro::PinProgram(out_id.GetPointer(), loc, cfg::OverrideStatus{});
|
||||
}
|
||||
|
||||
Result LoaderService::UnpinProgram(PinId id) {
|
||||
@@ -95,4 +109,12 @@ namespace ams::ldr {
|
||||
out.SetValue(ldr::HasLaunchedProgram(program_id));
|
||||
}
|
||||
|
||||
Result LoaderService::AtmosphereGetProgramInfo(sf::Out<ProgramInfo> out_program_info, sf::Out<cfg::OverrideStatus> out_status, const ncm::ProgramLocation &loc) {
|
||||
return GetProgramInfoImpl(out_program_info.GetPointer(), out_status.GetPointer(), loc);
|
||||
}
|
||||
|
||||
Result LoaderService::AtmospherePinProgram(sf::Out<PinId> out_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status) {
|
||||
return ldr::ro::PinProgram(out_id.GetPointer(), loc, override_status);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -33,6 +33,8 @@ namespace ams::ldr {
|
||||
virtual Result AtmosphereSetExternalContentSource(sf::OutMoveHandle out, ncm::ProgramId program_id);
|
||||
virtual void AtmosphereClearExternalContentSource(ncm::ProgramId program_id);
|
||||
virtual void AtmosphereHasLaunchedProgram(sf::Out<bool> out, ncm::ProgramId program_id);
|
||||
virtual Result AtmosphereGetProgramInfo(sf::Out<ProgramInfo> out_program_info, sf::Out<cfg::OverrideStatus> out_status, const ncm::ProgramLocation &loc);
|
||||
virtual Result AtmospherePinProgram(sf::Out<PinId> out_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status);
|
||||
};
|
||||
|
||||
namespace pm {
|
||||
@@ -42,10 +44,12 @@ namespace ams::ldr {
|
||||
enum class CommandId {
|
||||
CreateProcess = 0,
|
||||
GetProgramInfo = 1,
|
||||
PinProgram = 2,
|
||||
UnpinProgram = 3,
|
||||
PinProgram = 2,
|
||||
UnpinProgram = 3,
|
||||
|
||||
AtmosphereHasLaunchedProgram = 65000,
|
||||
AtmosphereGetProgramInfo = 65001,
|
||||
AtmospherePinProgram = 65002,
|
||||
};
|
||||
public:
|
||||
DEFINE_SERVICE_DISPATCH_TABLE {
|
||||
@@ -55,6 +59,8 @@ namespace ams::ldr {
|
||||
MAKE_SERVICE_COMMAND_META(UnpinProgram),
|
||||
|
||||
MAKE_SERVICE_COMMAND_META(AtmosphereHasLaunchedProgram),
|
||||
MAKE_SERVICE_COMMAND_META(AtmosphereGetProgramInfo),
|
||||
MAKE_SERVICE_COMMAND_META(AtmospherePinProgram),
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ namespace ams::ldr {
|
||||
|
||||
/* Global storage. */
|
||||
ncm::ProgramId g_cached_program_id;
|
||||
cfg::OverrideStatus g_cached_override_status;
|
||||
MetaCache g_meta_cache;
|
||||
MetaCache g_original_meta_cache;
|
||||
|
||||
@@ -144,11 +145,11 @@ namespace ams::ldr {
|
||||
}
|
||||
|
||||
/* API. */
|
||||
Result LoadMeta(Meta *out_meta, ncm::ProgramId program_id) {
|
||||
Result LoadMeta(Meta *out_meta, ncm::ProgramId program_id, const cfg::OverrideStatus &status) {
|
||||
FILE *f = nullptr;
|
||||
|
||||
/* Try to load meta from file. */
|
||||
R_TRY(OpenCodeFile(f, program_id, MetaFilePath));
|
||||
R_TRY(OpenCodeFile(f, program_id, status, MetaFilePath));
|
||||
{
|
||||
ON_SCOPE_EXIT { fclose(f); };
|
||||
R_TRY(LoadMetaFromFile(f, &g_meta_cache));
|
||||
@@ -161,8 +162,8 @@ namespace ams::ldr {
|
||||
meta->aci->program_id = program_id;
|
||||
|
||||
/* For HBL, we need to copy some information from the base meta. */
|
||||
if (cfg::IsHblOverrideKeyHeld(program_id)) {
|
||||
if (R_SUCCEEDED(OpenCodeFileFromBaseExefs(f, program_id, MetaFilePath))) {
|
||||
if (status.IsHbl()) {
|
||||
if (R_SUCCEEDED(OpenCodeFileFromBaseExefs(f, program_id, status, MetaFilePath))) {
|
||||
ON_SCOPE_EXIT { fclose(f); };
|
||||
if (R_SUCCEEDED(LoadMetaFromFile(f, &g_original_meta_cache))) {
|
||||
Meta *o_meta = &g_original_meta_cache.meta;
|
||||
@@ -182,14 +183,15 @@ namespace ams::ldr {
|
||||
|
||||
/* Set output. */
|
||||
g_cached_program_id = program_id;
|
||||
g_cached_override_status = status;
|
||||
*out_meta = *meta;
|
||||
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
Result LoadMetaFromCache(Meta *out_meta, ncm::ProgramId program_id) {
|
||||
if (g_cached_program_id != program_id) {
|
||||
return LoadMeta(out_meta, program_id);
|
||||
Result LoadMetaFromCache(Meta *out_meta, ncm::ProgramId program_id, const cfg::OverrideStatus &status) {
|
||||
if (g_cached_program_id != program_id || g_cached_override_status != status) {
|
||||
return LoadMeta(out_meta, program_id, status);
|
||||
}
|
||||
*out_meta = g_meta_cache.meta;
|
||||
return ResultSuccess();
|
||||
|
||||
@@ -33,8 +33,8 @@ namespace ams::ldr {
|
||||
};
|
||||
|
||||
/* Meta API. */
|
||||
Result LoadMeta(Meta *out_meta, ncm::ProgramId program_id);
|
||||
Result LoadMetaFromCache(Meta *out_meta, ncm::ProgramId program_id);
|
||||
Result LoadMeta(Meta *out_meta, ncm::ProgramId program_id, const cfg::OverrideStatus &status);
|
||||
Result LoadMetaFromCache(Meta *out_meta, ncm::ProgramId program_id, const cfg::OverrideStatus &status);
|
||||
void InvalidateMetaCache();
|
||||
|
||||
}
|
||||
|
||||
@@ -265,14 +265,14 @@ namespace ams::ldr {
|
||||
return static_cast<Acid::PoolPartition>((meta->acid->flags & Acid::AcidFlag_PoolPartitionMask) >> Acid::AcidFlag_PoolPartitionShift);
|
||||
}
|
||||
|
||||
Result LoadNsoHeaders(ncm::ProgramId program_id, NsoHeader *nso_headers, bool *has_nso) {
|
||||
Result LoadNsoHeaders(ncm::ProgramId program_id, const cfg::OverrideStatus &override_status, NsoHeader *nso_headers, bool *has_nso) {
|
||||
/* Clear NSOs. */
|
||||
std::memset(nso_headers, 0, sizeof(*nso_headers) * Nso_Count);
|
||||
std::memset(has_nso, 0, sizeof(*has_nso) * Nso_Count);
|
||||
|
||||
for (size_t i = 0; i < Nso_Count; i++) {
|
||||
FILE *f = nullptr;
|
||||
if (R_SUCCEEDED(OpenCodeFile(f, program_id, GetNsoName(i)))) {
|
||||
if (R_SUCCEEDED(OpenCodeFile(f, program_id, override_status, GetNsoName(i)))) {
|
||||
ON_SCOPE_EXIT { fclose(f); };
|
||||
/* Read NSO header. */
|
||||
R_UNLESS(fread(nso_headers + i, sizeof(*nso_headers), 1, f) == 1, ResultInvalidNso());
|
||||
@@ -611,14 +611,14 @@ namespace ams::ldr {
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
Result LoadNsosIntoProcessMemory(const ProcessInfo *process_info, const ncm::ProgramId program_id, const NsoHeader *nso_headers, const bool *has_nso, const args::ArgumentInfo *arg_info) {
|
||||
Result LoadNsosIntoProcessMemory(const ProcessInfo *process_info, const ncm::ProgramId program_id, const cfg::OverrideStatus &override_status, const NsoHeader *nso_headers, const bool *has_nso, const args::ArgumentInfo *arg_info) {
|
||||
const Handle process_handle = process_info->process_handle.Get();
|
||||
|
||||
/* Load each NSO. */
|
||||
for (size_t i = 0; i < Nso_Count; i++) {
|
||||
if (has_nso[i]) {
|
||||
FILE *f = nullptr;
|
||||
R_TRY(OpenCodeFile(f, program_id, GetNsoName(i)));
|
||||
R_TRY(OpenCodeFile(f, program_id, override_status, GetNsoName(i)));
|
||||
ON_SCOPE_EXIT { fclose(f); };
|
||||
|
||||
uintptr_t map_address = 0;
|
||||
@@ -655,7 +655,7 @@ namespace ams::ldr {
|
||||
}
|
||||
|
||||
/* Process Creation API. */
|
||||
Result CreateProcess(Handle *out, PinId pin_id, const ncm::ProgramLocation &loc, const char *path, u32 flags, Handle reslimit_h) {
|
||||
Result CreateProcess(Handle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, u32 flags, Handle reslimit_h) {
|
||||
/* Use global storage for NSOs. */
|
||||
NsoHeader *nso_headers = g_nso_headers;
|
||||
bool *has_nso = g_has_nso;
|
||||
@@ -663,18 +663,18 @@ namespace ams::ldr {
|
||||
|
||||
{
|
||||
/* Mount code. */
|
||||
ScopedCodeMount mount(loc);
|
||||
ScopedCodeMount mount(loc, override_status);
|
||||
R_TRY(mount.GetResult());
|
||||
|
||||
/* Load meta, possibly from cache. */
|
||||
Meta meta;
|
||||
R_TRY(LoadMetaFromCache(&meta, loc.program_id));
|
||||
R_TRY(LoadMetaFromCache(&meta, loc.program_id, override_status));
|
||||
|
||||
/* Validate meta. */
|
||||
R_TRY(ValidateMeta(&meta, loc));
|
||||
|
||||
/* Load, validate NSOs. */
|
||||
R_TRY(LoadNsoHeaders(loc.program_id, nso_headers, has_nso));
|
||||
R_TRY(LoadNsoHeaders(loc.program_id, override_status, nso_headers, has_nso));
|
||||
R_TRY(ValidateNsoHeaders(nso_headers, has_nso));
|
||||
|
||||
/* Actually create process. */
|
||||
@@ -682,7 +682,7 @@ namespace ams::ldr {
|
||||
R_TRY(CreateProcessImpl(&info, &meta, nso_headers, has_nso, arg_info, flags, reslimit_h));
|
||||
|
||||
/* Load NSOs into process memory. */
|
||||
R_TRY(LoadNsosIntoProcessMemory(&info, loc.program_id, nso_headers, has_nso, arg_info));
|
||||
R_TRY(LoadNsosIntoProcessMemory(&info, loc.program_id, override_status, nso_headers, has_nso, arg_info));
|
||||
|
||||
/* Register NSOs with ro manager. */
|
||||
{
|
||||
@@ -719,14 +719,17 @@ namespace ams::ldr {
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
Result GetProgramInfo(ProgramInfo *out, const ncm::ProgramLocation &loc) {
|
||||
Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc) {
|
||||
Meta meta;
|
||||
|
||||
/* Load Meta. */
|
||||
{
|
||||
ScopedCodeMount mount(loc);
|
||||
R_TRY(mount.GetResult());
|
||||
R_TRY(LoadMeta(&meta, loc.program_id));
|
||||
R_TRY(LoadMeta(&meta, loc.program_id, mount.GetOverrideStatus()));
|
||||
if (out_status != nullptr) {
|
||||
*out_status = mount.GetOverrideStatus();
|
||||
}
|
||||
}
|
||||
|
||||
return GetProgramInfoFromMeta(out, &meta);
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
namespace ams::ldr {
|
||||
|
||||
/* Process Creation API. */
|
||||
Result CreateProcess(Handle *out, PinId pin_id, const ncm::ProgramLocation &loc, const char *path, u32 flags, Handle reslimit_h);
|
||||
Result GetProgramInfo(ProgramInfo *out, const ncm::ProgramLocation &loc);
|
||||
Result CreateProcess(Handle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, u32 flags, Handle reslimit_h);
|
||||
Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc);
|
||||
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ namespace ams::ldr::ro {
|
||||
PinId pin_id;
|
||||
os::ProcessId process_id;
|
||||
ncm::ProgramId program_id;
|
||||
cfg::OverrideStatus override_status;
|
||||
ncm::ProgramLocation loc;
|
||||
ModuleInfo modules[ModuleCountMax];
|
||||
bool in_use;
|
||||
@@ -76,7 +77,7 @@ namespace ams::ldr::ro {
|
||||
}
|
||||
|
||||
/* RO Manager API. */
|
||||
Result PinProgram(PinId *out, const ncm::ProgramLocation &loc) {
|
||||
Result PinProgram(PinId *out, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status) {
|
||||
*out = InvalidPinId;
|
||||
ProcessInfo *info = GetFreeProcessInfo();
|
||||
R_UNLESS(info != nullptr, ldr::ResultTooManyProcesses());
|
||||
@@ -86,6 +87,7 @@ namespace ams::ldr::ro {
|
||||
std::memset(info, 0, sizeof(*info));
|
||||
info->pin_id = { s_cur_pin_id++ };
|
||||
info->loc = loc;
|
||||
info->override_status = status;
|
||||
info->in_use = true;
|
||||
*out = info->pin_id;
|
||||
return ResultSuccess();
|
||||
@@ -100,11 +102,12 @@ namespace ams::ldr::ro {
|
||||
}
|
||||
|
||||
|
||||
Result GetProgramLocation(ncm::ProgramLocation *out, PinId id) {
|
||||
Result GetProgramLocationAndStatus(ncm::ProgramLocation *out, cfg::OverrideStatus *out_status, PinId id) {
|
||||
ProcessInfo *info = GetProcessInfo(id);
|
||||
R_UNLESS(info != nullptr, ldr::ResultNotPinned());
|
||||
|
||||
*out = info->loc;
|
||||
*out_status = info->override_status;
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
namespace ams::ldr::ro {
|
||||
|
||||
/* RO Manager API. */
|
||||
Result PinProgram(PinId *out, const ncm::ProgramLocation &loc);
|
||||
Result PinProgram(PinId *out, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status);
|
||||
Result UnpinProgram(PinId id);
|
||||
Result GetProgramLocation(ncm::ProgramLocation *out, PinId id);
|
||||
Result GetProgramLocationAndStatus(ncm::ProgramLocation *out, cfg::OverrideStatus *out_status, PinId id);
|
||||
Result RegisterProcess(PinId id, os::ProcessId process_id, ncm::ProgramId program_id);
|
||||
Result RegisterModule(PinId id, const u8 *build_id, uintptr_t address, size_t size);
|
||||
Result GetProcessModuleInfo(u32 *out_count, ModuleInfo *out, size_t max_out_count, os::ProcessId process_id);
|
||||
|
||||
Reference in New Issue
Block a user