OmniNX/Atmosphere
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

kern/loader: fix git rebase errors

Browse Source
This commit is contained in:
Alula
2026-09-18 07:21:22 +02:00
parent 3cfac4c2d8
commit 85f119a5c4
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/libmesosphere/source/kern_k_process.cpp
View File

@@ -265,7 +265,7 @@ namespace ams::kern {
m_is_immortal = immortal; m_is_immortal = immortal;
/* Reseed the random generator on application launch. */ /* Reseed the random generator on application launch. */
if (params.flags & ams::svc::CreateProcessFlag_IsApplication) { if (params.flags & ams::svc::CreateProcessParameterFlag_IsApplication) {
KSystemControl::ReseedRandomGenerator(); KSystemControl::ReseedRandomGenerator();
} }
@@ -338,7 +338,7 @@ namespace ams::kern {
m_is_immortal = false; m_is_immortal = false;
/* Reseed the random generator on application launch. */ /* Reseed the random generator on application launch. */
if (params.flags & ams::svc::CreateProcessFlag_IsApplication) { if (params.flags & ams::svc::CreateProcessParameterFlag_IsApplication) {
KSystemControl::ReseedRandomGenerator(); KSystemControl::ReseedRandomGenerator();
} }

2
libraries/libmesosphere/source/kern_k_thread.cpp
View File

@@ -287,7 +287,7 @@ namespace ams::kern {
std::memset(m_tls_heap_address, 0, ams::svc::ThreadLocalRegionSize); std::memset(m_tls_heap_address, 0, ams::svc::ThreadLocalRegionSize);
/* If the owning process has a shadow stack, allocate and map a page for this thread. */ /* If the owning process has a shadow stack, allocate and map a page for this thread. */
if (owner->GetCreateProcessFlags() & ams::svc::CreateProcessFlag_EnableShadowStack) { if (owner->GetCreateProcessParameterFlags() & ams::svc::CreateProcessParameterFlag_EnableShadowStack) {
/* Allocate the backing page. */ /* Allocate the backing page. */
KPageBuffer *page = KPageBuffer::AllocateChecked<PageSize>(); KPageBuffer *page = KPageBuffer::AllocateChecked<PageSize>();
if (page == nullptr) { if (page == nullptr) {

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

@@ -499,11 +499,6 @@ namespace ams::ldr {
flags |= svc::CreateProcessParameterFlag_EnableShadowStack; flags |= svc::CreateProcessParameterFlag_EnableShadowStack;
} }
/* 23.0.0+/meso Set EnableShadowStack. */
if (meta->npdm->flags2 & Npdm::MetaFlag2_EnableShadowStack) {
flags |= svc::CreateProcessFlag_EnableShadowStack;
}
*out = flags; *out = flags;
R_SUCCEED(); R_SUCCEED();
} }