mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-06-21 02:42:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting and simplify code

Browse Source 
Signed-off-by: Mako <61922615+Makonede@users.noreply.github.com>
This commit is contained in:
Mako 2024-08-23 10:48:00 -07:00 committed by GitHub
parent 96c5f03d36
commit 9c1f7602d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stratosphere/loader/source/ldr_process_creation.cpp
View File

@ -455,7 +455,7 @@ namespace ams::ldr {
out->nso_size[i] = text_end;
out->nso_size[i] = std::max(out->nso_size[i], ro_end);
out->nso_size[i] = std::max(out->nso_size[i], rw_end);
out->nso_size[i] = util::AlignUp(out->nso_size[i], os::MemoryPageSize);
out->nso_size[i] = util::AlignUp(out->nso_size[i], os::MemoryPageSize);
total_size += out->nso_size[i];
@ -507,17 +507,7 @@ namespace ams::ldr {
aslr_slide = GenerateSecureRandom(free_size / os::MemoryBlockUnitSize) * os::MemoryBlockUnitSize;
}
else {
fs::FileHandle aslr;
if (R_SUCCEEDED(fs::OpenFile(std::addressof(aslr), ASLR_CONFIG, fs::OpenMode_Read))) {
ON_SCOPE_EXIT { fs::CloseFile(aslr); };
size_t read_size;
uintptr_t address = 0;
if (R_SUCCEEDED(fs::ReadFile(std::addressof(read_size), aslr, 0, &address, sizeof address)) && read_size == sizeof address) aslr_start = address;
else aslr_start = 0xcafe00000; // FIXME
}
else aslr_slide = (0xfd000000 / os::MemoryBlockUnitSize) * os::MemoryBlockUnitSize - 0x8000000;
aslr_start = 0xffe00000;
}
/* Set out. */