XorTroll/SaltyNX
1
0
Fork 0
mirror of https://github.com/XorTroll/SaltyNX.git synced 2024-11-30 04:40:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Load ELFs from sdmc:/SaltySD/plugins/<TID>/

Browse Source
This commit is contained in:
shinyquagsire23 2019-04-29 16:31:40 -06:00
parent 9e94e86c5d
commit dc20e36195
4 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
saltysd_bootstrap/source/main.c
View File

@ -67,7 +67,7 @@ Result saltySDLoadELF(Handle salt, u64 heap, u64* elf_addr, u64* elf_size, char*
u64 magic;
u64 cmd_id;
u64 heap;
char name[32];
char name[64];
u64 reserved[2];
} *raw;
@ -76,7 +76,7 @@ Result saltySDLoadELF(Handle salt, u64 heap, u64* elf_addr, u64* elf_size, char*
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->heap = heap;
memcpy(raw->name, name, 31);
memcpy(raw->name, name, 63);
ret = ipcDispatch(salt);

51
saltysd_core/source/main.c
View File

@ -2,6 +2,7 @@
#include <string.h>
#include <stdio.h>
#include <inttypes.h>
#include <dirent.h>
#include <sys/iosupport.h>
#include <sys/reent.h>
@ -218,18 +219,17 @@ void SaltySDCore_PatchSVCs()
if (ret) debug_log("svcSetHeapSize memcpy failed!\n");
}
void SaltySDCore_LoadPlugins()
void** SaltySDCore_LoadPluginsInDir(char* path, void** entries, size_t* num_elfs)
{
// Load plugin ELFs
void** tp = (void**)((u8*)armGetTls() + 0x1F8);
*tp = malloc(0x1000);
void** entries = NULL;
size_t num_elfs = 0;
char* tmp = malloc(0x80);
DIR *d;
struct dirent *dir;
d = opendir("sdmc:/SaltySD/plugins/");
SaltySD_printf("SaltySD Core: Searching plugin dir `%s'...\n", path);
snprintf(tmp, 0x80, "sdmc:/SaltySD/plugins/%s", path);
d = opendir(tmp);
if (d)
{
while ((dir = readdir(d)) != NULL)
@ -239,18 +239,42 @@ void SaltySDCore_LoadPlugins()
{
u64 elf_addr, elf_size;
setupELFHeap();
SaltySD_LoadELF(find_next_elf_heap(), &elf_addr, &elf_size, dir->d_name);
snprintf(tmp, 0x80, "%s%s", path, dir->d_name);
SaltySD_LoadELF(find_next_elf_heap(), &elf_addr, &elf_size, tmp);
entries = realloc(entries, ++num_elfs * sizeof(void*));
entries[num_elfs-1] = (void*)elf_addr;
*num_elfs = *num_elfs + 1;
entries = realloc(entries, *num_elfs * sizeof(void*));
entries[*num_elfs-1] = (void*)elf_addr;
SaltySDCore_RegisterModule(entries[num_elfs-1]);
SaltySDCore_RegisterModule(entries[*num_elfs-1]);
elf_area_size += elf_size;
}
}
closedir(d);
}
free(tmp);
return entries;
}
void SaltySDCore_LoadPlugins()
{
// Load plugin ELFs
void** tp = (void**)((u8*)armGetTls() + 0x1F8);
*tp = malloc(0x1000);
char* tmp = malloc(0x20);
void** entries = NULL;
size_t num_elfs = 0;
uint64_t tid = 0;
svcGetInfo(&tid, 18, CUR_PROCESS_HANDLE, 0);
entries = SaltySDCore_LoadPluginsInDir("", entries, &num_elfs);
snprintf(tmp, 0x20, "%016" PRIx64 "/", tid);
entries = SaltySDCore_LoadPluginsInDir(tmp, entries, &num_elfs);
for (int i = 0; i < num_elfs; i++)
{
@ -261,6 +285,7 @@ void SaltySDCore_LoadPlugins()
free(entries);
free(*tp);
free(tmp);
}
int main(int argc, char *argv[])

4
saltysd_core/source/saltysd_ipc.c
View File

@ -132,7 +132,7 @@ Result SaltySD_LoadELF(u64 heap, u64* elf_addr, u64* elf_size, char* name)
u64 magic;
u64 cmd_id;
u64 heap;
char name[32];
char name[64];
u64 reserved[2];
} *raw;
@ -141,7 +141,7 @@ Result SaltySD_LoadELF(u64 heap, u64* elf_addr, u64* elf_size, char* name)
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->heap = heap;
strncpy(raw->name, name, 31);
strncpy(raw->name, name, 63);
ret = ipcDispatch(saltysd);

12
saltysd_proc/source/main.c
View File

@ -110,27 +110,27 @@ Result handleServiceCmd(int cmd)
u64 magic;
u64 command;
u64 heap;
char name[32];
char name[64];
u32 reserved[2];
} *resp = r.Raw;
Handle proc = r.Handles[0];
u64 heap = resp->heap;
char name[32];
char name[64];
memcpy(name, resp->name, 32);
memcpy(name, resp->name, 64);
SaltySD_printf("SaltySD: cmd 1 handler, proc handle %x, heap %llx, path %s\n", proc, heap, name);
char* path = malloc(64);
char* path = malloc(96);
uint8_t* elf_data = NULL;
u32 elf_size = 0;
snprintf(path, 64, "sdmc:/SaltySD/plugins/%s", name);
snprintf(path, 96, "sdmc:/SaltySD/plugins/%s", name);
FILE* f = fopen(path, "rb");
if (!f)
{
snprintf(path, 64, "sdmc:/SaltySD/%s", name);
snprintf(path, 96, "sdmc:/SaltySD/%s", name);
f = fopen(path, "rb");
}