Check if the payload.elf will be loaded into a valid location

This commit is contained in:
Maschell 2020-12-05 21:31:27 +01:00
parent bc61589b7f
commit 37cdd92236

View File

@ -8,6 +8,7 @@
#include <whb/file.h>
#include <whb/log.h>
#include <utils/logger.h>
#include <stdbool.h>
#include "elf_abi.h"
@ -41,6 +42,10 @@ int32_t LoadFileToMem(const char *relativefilepath, char **fileOut, uint32_t *si
static void InstallMain(void *data_elf);
static bool CheckElfLoadedBetween(void *data_elf, uint32_t start_address, uint32_t end_address);
static unsigned int get_section(void *data, const char *name, unsigned int *size, unsigned int *addr, int fail_on_not_found);
uint32_t load_loader_elf_from_sd(unsigned char *baseAddress, const char *relativePath) {
char *elf_data = NULL;
uint32_t fileSize = 0;
@ -48,6 +53,9 @@ uint32_t load_loader_elf_from_sd(unsigned char *baseAddress, const char *relativ
return 0;
}
if (!CheckElfLoadedBetween(elf_data, 0x00800000, 0x00FD0000)) {
return 0;
}
InstallMain(elf_data);
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) elf_data;
@ -59,6 +67,37 @@ uint32_t load_loader_elf_from_sd(unsigned char *baseAddress, const char *relativ
return res;
}
static bool CheckElfSectionLoadedBetween(void *data_elf, const char *name, uint32_t start_address, uint32_t end_address) {
unsigned int target_addr = 0;
unsigned int len = 0;
if (get_section(data_elf, name, &target_addr, &len, 0) > 0) {
if (target_addr < start_address || target_addr + len > end_address) {
return false;
}
}
return true;
}
static bool CheckElfLoadedBetween(void *data_elf, uint32_t start_address, uint32_t end_address) {
if (CheckElfSectionLoadedBetween(data_elf, ".text", start_address, end_address)) {
DEBUG_FUNCTION_LINE("ERROR: The .text would be loaded into a invalid location.");
return false;
}
if (CheckElfSectionLoadedBetween(data_elf, ".rodata", start_address, end_address)) {
DEBUG_FUNCTION_LINE("ERROR: The .rodata would be loaded into a invalid location.");
return false;
}
if (CheckElfSectionLoadedBetween(data_elf, ".data", start_address, end_address)) {
DEBUG_FUNCTION_LINE("ERROR: The .data would be loaded into a invalid location.");
return false;
}
if (CheckElfSectionLoadedBetween(data_elf, ".bss", start_address, end_address)) {
DEBUG_FUNCTION_LINE("ERROR: The .bss would be loaded into a invalid location.");
return false;
}
return true;
}
static unsigned int get_section(void *data, const char *name, unsigned int *size, unsigned int *addr, int fail_on_not_found) {
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) data;