set.mitm: fake compatibility for usb!usb30_force_enabled on 9.0.0+ (#1391)
* set.mitm: fake compatibility for usb!usb30_force_enabled on 9.0.0+ * set.mitm: add value meaning comment for usb!usb30_force_enabled * loader: pretend to be polite about patch ordering
This commit is contained in:
37
stratosphere/loader/source/ldr_embedded_usb_patches.inc
Normal file
37
stratosphere/loader/source/ldr_embedded_usb_patches.inc
Normal file
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* Copyright (c) 2018-2021 Atmosphère-NX
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/* Patch fallback case to mov w0, #1 rather than retrieving settings flag. */
|
||||
constexpr inline const EmbeddedPatchEntry Usb30ForceEnablePatches_9_0_0[] = {
|
||||
{ 0x521C, "\x20\x00\x80\x52", 4 },
|
||||
};
|
||||
|
||||
/* Patch fallback case to mov w0, #1 rather than retrieving settings flag. */
|
||||
constexpr inline const EmbeddedPatchEntry Usb30ForceEnablePatches_10_0_0[] = {
|
||||
{ 0x5494, "\x20\x00\x80\x52", 4 },
|
||||
};
|
||||
|
||||
/* Patch getter functions to return 1. */
|
||||
constexpr inline const EmbeddedPatchEntry Usb30ForceEnablePatches_11_0_0[] = {
|
||||
{ 0x85DC, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
|
||||
{ 0x866C, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
|
||||
};
|
||||
|
||||
constexpr inline const EmbeddedPatch Usb30ForceEnablePatches[] = {
|
||||
{ ParseModuleId("C0D3F4E87E8B0FE9BBE9F1968A20767F3DC08E03"), util::size(Usb30ForceEnablePatches_9_0_0), Usb30ForceEnablePatches_9_0_0 },
|
||||
{ ParseModuleId("B9C700CA8335F8BAA0D2041D8D09F772890BA988"), util::size(Usb30ForceEnablePatches_10_0_0), Usb30ForceEnablePatches_10_0_0 },
|
||||
{ ParseModuleId("95BAF06A69650C215A5DD50CF8BD2A603E7AD3C2"), util::size(Usb30ForceEnablePatches_11_0_0), Usb30ForceEnablePatches_11_0_0 },
|
||||
};
|
||||
@@ -30,8 +30,12 @@ namespace ams::ldr {
|
||||
constexpr const char * const LoaderSdMountName = "#amsldr-sdpatch";
|
||||
static_assert(sizeof(LoaderSdMountName) <= fs::MountNameLengthMax);
|
||||
|
||||
os::Mutex g_ldr_sd_lock(false);
|
||||
bool g_mounted_sd;
|
||||
constinit os::SdkMutex g_ldr_sd_lock;
|
||||
constinit bool g_mounted_sd;
|
||||
|
||||
constinit os::SdkMutex g_embedded_patch_lock;
|
||||
constinit bool g_got_embedded_patch_settings;
|
||||
constinit bool g_force_enable_usb30;
|
||||
|
||||
bool EnsureSdCardMounted() {
|
||||
std::scoped_lock lk(g_ldr_sd_lock);
|
||||
@@ -51,6 +55,59 @@ namespace ams::ldr {
|
||||
return (g_mounted_sd = true);
|
||||
}
|
||||
|
||||
bool IsUsb30ForceEnabled() {
|
||||
std::scoped_lock lk(g_embedded_patch_lock);
|
||||
|
||||
if (!g_got_embedded_patch_settings) {
|
||||
g_force_enable_usb30 = spl::IsUsb30ForceEnabled();
|
||||
g_got_embedded_patch_settings = true;
|
||||
}
|
||||
|
||||
return g_force_enable_usb30;
|
||||
}
|
||||
|
||||
consteval u8 ParseNybble(char c) {
|
||||
AMS_ASSUME(('0' <= c && c <= '9') || ('A' <= c && c <= 'F') || ('a' <= c && c <= 'f'));
|
||||
if ('0' <= c && c <= '9') {
|
||||
return c - '0' + 0x0;
|
||||
} else if ('A' <= c && c <= 'F') {
|
||||
return c - 'A' + 0xA;
|
||||
} else /* if ('a' <= c && c <= 'f') */ {
|
||||
return c - 'a' + 0xa;
|
||||
}
|
||||
}
|
||||
|
||||
consteval ro::ModuleId ParseModuleId(const char *str) {
|
||||
/* Parse a static module id. */
|
||||
ro::ModuleId module_id = {};
|
||||
|
||||
size_t ofs = 0;
|
||||
while (str[0] != 0) {
|
||||
AMS_ASSUME(ofs < sizeof(module_id));
|
||||
AMS_ASSUME(str[1] != 0);
|
||||
|
||||
module_id.build_id[ofs] = (ParseNybble(str[0]) << 4) | (ParseNybble(str[1]) << 0);
|
||||
|
||||
str += 2;
|
||||
ofs++;
|
||||
}
|
||||
|
||||
return module_id;
|
||||
}
|
||||
|
||||
struct EmbeddedPatchEntry {
|
||||
uintptr_t offset;
|
||||
const void * const data;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
struct EmbeddedPatch {
|
||||
ro::ModuleId module_id;
|
||||
size_t num_entries;
|
||||
const EmbeddedPatchEntry *entries;
|
||||
};
|
||||
|
||||
#include "ldr_embedded_usb_patches.inc"
|
||||
|
||||
}
|
||||
|
||||
@@ -65,4 +122,24 @@ namespace ams::ldr {
|
||||
ams::patcher::LocateAndApplyIpsPatchesToModule(LoaderSdMountName, NsoPatchesDirectory, NsoPatchesProtectedSize, NsoPatchesProtectedOffset, &module_id, reinterpret_cast<u8 *>(mapped_nso), mapped_size);
|
||||
}
|
||||
|
||||
/* Apply embedded patches. */
|
||||
void ApplyEmbeddedPatchesToModule(const u8 *build_id, uintptr_t mapped_nso, size_t mapped_size) {
|
||||
/* Make module id. */
|
||||
ro::ModuleId module_id;
|
||||
std::memcpy(&module_id.build_id, build_id, sizeof(module_id.build_id));
|
||||
|
||||
if (IsUsb30ForceEnabled()) {
|
||||
for (const auto &patch : Usb30ForceEnablePatches) {
|
||||
if (std::memcmp(std::addressof(patch.module_id), std::addressof(module_id), sizeof(module_id)) == 0) {
|
||||
for (size_t i = 0; i < patch.num_entries; ++i) {
|
||||
const auto &entry = patch.entries[i];
|
||||
if (entry.offset + entry.size <= mapped_size) {
|
||||
std::memcpy(reinterpret_cast<void *>(mapped_nso + entry.offset), entry.data, entry.size);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -21,4 +21,7 @@ namespace ams::ldr {
|
||||
/* Apply IPS patches. */
|
||||
void LocateAndApplyIpsPatchesToModule(const u8 *build_id, uintptr_t mapped_nso, size_t mapped_size);
|
||||
|
||||
/* Apply embedded patches. */
|
||||
void ApplyEmbeddedPatchesToModule(const u8 *build_id, uintptr_t mapped_nso, size_t mapped_size);
|
||||
|
||||
}
|
||||
@@ -534,6 +534,9 @@ namespace ams::ldr {
|
||||
std::memset(reinterpret_cast<void *>(map_address + ro_end), 0, nso_header->rw_dst_offset - ro_end);
|
||||
std::memset(reinterpret_cast<void *>(map_address + rw_end), 0, nso_header->bss_size);
|
||||
|
||||
/* Apply embedded patches. */
|
||||
ApplyEmbeddedPatchesToModule(nso_header->build_id, map_address, nso_size);
|
||||
|
||||
/* Apply IPS patches. */
|
||||
LocateAndApplyIpsPatchesToModule(nso_header->build_id, map_address, nso_size);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user