nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fs.mitm: fix set:sys race condition.

Browse source
This commit is contained in:
Michael Scire 2018-11-15 17:23:05 -08:00
parent abde50f162
commit d88fd04c73
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stratosphere/fs_mitm/source/fsmitm_main.cpp
View file

@ -88,7 +88,7 @@ int main(int argc, char **argv)
Thread sd_initializer_thread = {0}; Thread sd_initializer_thread = {0};
Thread hid_initializer_thread = {0}; Thread hid_initializer_thread = {0};
consoleDebugInit(debugDevice_SVC); consoleDebugInit(debugDevice_SVC);
if (R_FAILED(threadCreate(&sd_initializer_thread, &Utils::InitializeSdThreadFunc, NULL, 0x4000, 0x15, 0))) { if (R_FAILED(threadCreate(&sd_initializer_thread, &Utils::InitializeSdThreadFunc, NULL, 0x4000, 0x15, 0))) {
/* TODO: Panic. */ /* TODO: Panic. */
} }

26
stratosphere/fs_mitm/source/fsmitm_utils.cpp
View file

@ -40,7 +40,8 @@ static char g_config_ini_data[0x800];
/* Backup file for CAL0 partition. */ /* Backup file for CAL0 partition. */
static constexpr size_t ProdinfoSize = 0x8000; static constexpr size_t ProdinfoSize = 0x8000;
static FsFile g_cal0_file; static FsFile g_cal0_file = {0};
static u8 g_cal0_storage_backup[ProdinfoSize];
static u8 g_cal0_backup[ProdinfoSize]; static u8 g_cal0_backup[ProdinfoSize];
static bool IsHexadecimal(const char *str) { static bool IsHexadecimal(const char *str) {
@ -75,13 +76,14 @@ void Utils::InitializeSdThreadFunc(void *args) {
fsFsCreateDirectory(&g_sd_filesystem, "/atmosphere/automatic_backups"); fsFsCreateDirectory(&g_sd_filesystem, "/atmosphere/automatic_backups");
{ {
FsStorage cal0_storage; FsStorage cal0_storage;
if (R_FAILED(fsOpenBisStorage(&cal0_storage, BisStorageId_Prodinfo)) || R_FAILED(fsStorageRead(&cal0_storage, 0, g_cal0_storage_backup, ProdinfoSize))) {
std::abort();
}
fsStorageClose(&cal0_storage);
char serial_number[0x40] = {0}; char serial_number[0x40] = {0};
memcpy(serial_number, g_cal0_storage_backup + 0x250, 0x18);
if (R_SUCCEEDED(setsysInitialize())) {
setsysGetSerialNumber(serial_number);
setsysExit();
}
char prodinfo_backup_path[FS_MAX_PATH] = {0}; char prodinfo_backup_path[FS_MAX_PATH] = {0};
if (strlen(serial_number) > 0) { if (strlen(serial_number) > 0) {
@ -89,7 +91,8 @@ void Utils::InitializeSdThreadFunc(void *args) {
} else { } else {
snprintf(prodinfo_backup_path, sizeof(prodinfo_backup_path) - 1, "/atmosphere/automatic_backups/PRODINFO.bin"); snprintf(prodinfo_backup_path, sizeof(prodinfo_backup_path) - 1, "/atmosphere/automatic_backups/PRODINFO.bin");
} }
fsFsCreateFile(&g_sd_filesystem, prodinfo_backup_path, ProdinfoSize, 0);
if (R_SUCCEEDED(fsFsOpenFile(&g_sd_filesystem, prodinfo_backup_path, FS_OPEN_READ | FS_OPEN_WRITE, &g_cal0_file))) { if (R_SUCCEEDED(fsFsOpenFile(&g_sd_filesystem, prodinfo_backup_path, FS_OPEN_READ | FS_OPEN_WRITE, &g_cal0_file))) {
bool has_auto_backup = false; bool has_auto_backup = false;
size_t read = 0; size_t read = 0;
@ -111,15 +114,14 @@ void Utils::InitializeSdThreadFunc(void *args) {
has_auto_backup = is_cal0_valid; has_auto_backup = is_cal0_valid;
} }
if (!has_auto_backup && R_SUCCEEDED(fsOpenBisStorage(&cal0_storage, BisStorageId_Prodinfo))) { if (!has_auto_backup) {
if (R_SUCCEEDED(fsStorageRead(&cal0_storage, 0, g_cal0_backup, ProdinfoSize)) ) { fsFileSetSize(&g_cal0_file, ProdinfoSize);
fsFileSetSize(&g_cal0_file, ProdinfoSize); fsFileWrite(&g_cal0_file, 0, g_cal0_backup, ProdinfoSize);
fsFileWrite(&g_cal0_file, 0, g_cal0_backup, ProdinfoSize); fsFileFlush(&g_cal0_file);
fsFileFlush(&g_cal0_file);
}
} }
/* NOTE: g_cal0_file is intentionally not closed here. This prevents any other process from opening it. */ /* NOTE: g_cal0_file is intentionally not closed here. This prevents any other process from opening it. */
memset(g_cal0_storage_backup, 0, sizeof(g_cal0_storage_backup));
memset(g_cal0_backup, 0, sizeof(g_cal0_backup)); memset(g_cal0_backup, 0, sizeof(g_cal0_backup));
} }
} }