The-Homebrew-Cloud/WUMSLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/WUMSLoader.git synced 2024-11-06 00:05:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure to use a aligned buffer for reading files

Browse Source
This commit is contained in:
Maschell 2022-02-11 20:03:22 +01:00
parent 00dec53199
commit df71cb0af1
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/module/ModuleDataFactory.cpp
View File

@ -17,7 +17,6 @@
#include "ModuleDataFactory.h" #include "ModuleDataFactory.h"
#include "ElfUtils.h" #include "ElfUtils.h"
#include "FunctionSymbolData.h"
#include "utils/utils.h" #include "utils/utils.h"
#include <coreinit/cache.h> #include <coreinit/cache.h>
#include <map> #include <map>
@ -32,9 +31,28 @@ ModuleDataFactory::load(const std::string &path, uint32_t *destination_address_p
elfio reader; elfio reader;
std::shared_ptr<ModuleData> moduleData = std::make_shared<ModuleData>(); std::shared_ptr<ModuleData> moduleData = std::make_shared<ModuleData>();
FILE *f = fopen(path.c_str(), "rb");
fseek(f, 0, SEEK_END);
auto fsize = ftell(f);
fseek(f, 0, SEEK_SET);
auto *buffer = static_cast<char *>(memalign(0x40, ROUNDUP(fsize + 1, 0x40)));
if (!buffer) {
fclose(f);
DEBUG_FUNCTION_LINE("Failed to allocate buffer");
}
if ((long) fread(buffer, fsize, 1, f) != fsize) {
DEBUG_FUNCTION_LINE("Failed to load data into buffer");
free(buffer);
fclose(f);
return {};
}
fclose(f);
// Load ELF data // Load ELF data
if (!reader.load(path)) { if (!reader.load(buffer, fsize)) {
DEBUG_FUNCTION_LINE("Can't find or process %s", path.c_str()); DEBUG_FUNCTION_LINE("Can't find or process %s", path.c_str());
free(buffer);
return std::nullopt; return std::nullopt;
} }
@ -42,6 +60,11 @@ ModuleDataFactory::load(const std::string &path, uint32_t *destination_address_p
auto **destinations = (uint8_t **) malloc(sizeof(uint8_t *) * sec_num); auto **destinations = (uint8_t **) malloc(sizeof(uint8_t *) * sec_num);
if (!destinations) {
DEBUG_FUNCTION_LINE("Failed to alloc memory for destinations");
free(buffer);
}
uint32_t baseOffset = *destination_address_ptr; uint32_t baseOffset = *destination_address_ptr;
uint32_t offset_text = baseOffset; uint32_t offset_text = baseOffset;
@ -64,6 +87,8 @@ ModuleDataFactory::load(const std::string &path, uint32_t *destination_address_p
totalSize += sectionSize; totalSize += sectionSize;
if (totalSize > maximum_size) { if (totalSize > maximum_size) {
DEBUG_FUNCTION_LINE("Couldn't load setup module because it's too big."); DEBUG_FUNCTION_LINE("Couldn't load setup module because it's too big.");
free(destinations);
free(buffer);
return {}; return {};
} }
@ -86,6 +111,7 @@ ModuleDataFactory::load(const std::string &path, uint32_t *destination_address_p
} else { } else {
DEBUG_FUNCTION_LINE("Unhandled case"); DEBUG_FUNCTION_LINE("Unhandled case");
free(destinations); free(destinations);
free(buffer);
return std::nullopt; return std::nullopt;
} }
@ -127,6 +153,7 @@ ModuleDataFactory::load(const std::string &path, uint32_t *destination_address_p
if (!linkSection(reader, psec->get_index(), (uint32_t) destinations[psec->get_index()], offset_text, offset_data, trampoline_data, trampoline_data_length)) { if (!linkSection(reader, psec->get_index(), (uint32_t) destinations[psec->get_index()], offset_text, offset_data, trampoline_data, trampoline_data_length)) {
DEBUG_FUNCTION_LINE("elfLink failed"); DEBUG_FUNCTION_LINE("elfLink failed");
free(destinations); free(destinations);
free(buffer);
return std::nullopt; return std::nullopt;
} }
} }
@ -203,6 +230,8 @@ ModuleDataFactory::load(const std::string &path, uint32_t *destination_address_p
} else if (key == "wums") { } else if (key == "wums") {
if (value != "0.3") { if (value != "0.3") {
DEBUG_FUNCTION_LINE("Warning: Ignoring module - Unsupported WUMS version: %s.\n", value.c_str()); DEBUG_FUNCTION_LINE("Warning: Ignoring module - Unsupported WUMS version: %s.\n", value.c_str());
free(destinations);
free(buffer);
return std::nullopt; return std::nullopt;
} }
} }
@ -259,6 +288,7 @@ ModuleDataFactory::load(const std::string &path, uint32_t *destination_address_p
ICInvalidateRange((void *) *destination_address_ptr, totalSize); ICInvalidateRange((void *) *destination_address_ptr, totalSize);
free(destinations); free(destinations);
free(buffer);
moduleData->setEntrypoint(entrypoint); moduleData->setEntrypoint(entrypoint);
moduleData->setStartAddress(*destination_address_ptr); moduleData->setStartAddress(*destination_address_ptr);