The-Homebrew-Cloud/MochaPayload
2
0
Fork 0
mirror of https://github.com/wiiu-env/MochaPayload.git synced 2024-11-17 21:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Maschell 2020-06-20 23:43:44 +02:00
parent 78d8526363
commit ed4ad86a9c
42 changed files with 1951 additions and 2143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/ios_exploit.c
View File

@ -19,11 +19,12 @@ extern const uint8_t launch_image_tga[];
extern const uint32_t launch_image_tga_size; extern const uint32_t launch_image_tga_size;
static void uhs_exploit_init(int uhs_handle); static void uhs_exploit_init(int uhs_handle);
static int uhs_write32(int uhs_handle, int arm_addr, int val); static int uhs_write32(int uhs_handle, int arm_addr, int val);
//!------Variables used in exploit------ //!------Variables used in exploit------
static int *pretend_root_hub = (int*)0xF5003ABC; static int *pretend_root_hub = (int *) 0xF5003ABC;
static int *ayylmao = (int*)0xF4500000; static int *ayylmao = (int *) 0xF4500000;
//!------------------------------------- //!-------------------------------------
typedef struct __attribute__((packed)) { typedef struct __attribute__((packed)) {
@ -307,15 +308,15 @@ static void uhs_exploit_init(int dev_uhs_0_handle) {
ayylmao[5] = 1; ayylmao[5] = 1;
ayylmao[8] = 0x500000; ayylmao[8] = 0x500000;
memcpy((char*)(0xF4120000), second_chain, sizeof(second_chain)); memcpy((char *) (0xF4120000), second_chain, sizeof(second_chain));
memcpy((char*)(0xF4130000), final_chain, sizeof(final_chain)); memcpy((char *) (0xF4130000), final_chain, sizeof(final_chain));
memcpy((char*)(0xF4140000), ios_kernel_bin, sizeof(ios_kernel_bin)); memcpy((char *) (0xF4140000), ios_kernel_bin, sizeof(ios_kernel_bin));
payload_info_t *payloads = (payload_info_t*)0xF4148000; payload_info_t *payloads = (payload_info_t *) 0xF4148000;
payloads->size = sizeof(ios_usb_bin); payloads->size = sizeof(ios_usb_bin);
memcpy(payloads->data, ios_usb_bin, payloads->size); memcpy(payloads->data, ios_usb_bin, payloads->size);
payloads = (payload_info_t*)0xF4160000; payloads = (payload_info_t *) 0xF4160000;
payloads->size = sizeof(ios_mcp_bin); payloads->size = sizeof(ios_mcp_bin);
memcpy(payloads->data, ios_mcp_bin, payloads->size); memcpy(payloads->data, ios_mcp_bin, payloads->size);
@ -324,24 +325,24 @@ static void uhs_exploit_init(int dev_uhs_0_handle) {
pretend_root_hub[78] = 0; pretend_root_hub[78] = 0;
DCStoreRange(pretend_root_hub + 33, 200); DCStoreRange(pretend_root_hub + 33, 200);
DCStoreRange((void*)0xF4120000, sizeof(second_chain)); DCStoreRange((void *) 0xF4120000, sizeof(second_chain));
DCStoreRange((void*)0xF4130000, sizeof(final_chain)); DCStoreRange((void *) 0xF4130000, sizeof(final_chain));
DCStoreRange((void*)0xF4140000, sizeof(ios_kernel_bin)); DCStoreRange((void *) 0xF4140000, sizeof(ios_kernel_bin));
DCStoreRange((void*)0xF4148000, ((uint32_t)0xF4180000) - 0xF4148000); DCStoreRange((void *) 0xF4148000, ((uint32_t) 0xF4180000) - 0xF4148000);
} }
static int uhs_write32(int dev_uhs_0_handle, int arm_addr, int val) { static int uhs_write32(int dev_uhs_0_handle, int arm_addr, int val) {
ayylmao[520] = arm_addr - 24; //! The address to be overwritten, minus 24 bytes ayylmao[520] = arm_addr - 24; //! The address to be overwritten, minus 24 bytes
DCStoreRange(ayylmao, 521 * 4); //! Make CPU fetch new data (with updated adress) DCStoreRange(ayylmao, 521 * 4); //! Make CPU fetch new data (with updated adress)
OSSleepTicks(0x200000); //! Improves stability OSSleepTicks(0x200000); //! Improves stability
int request_buffer[] = { -(0xBEA2C), val }; //! -(0xBEA2C) gets IOS_USB to read from the middle of MEM1 int request_buffer[] = {-(0xBEA2C), val}; //! -(0xBEA2C) gets IOS_USB to read from the middle of MEM1
int output_buffer[32]; int output_buffer[32];
return IOS_Ioctl(dev_uhs_0_handle, 0x15, request_buffer, sizeof(request_buffer), output_buffer, sizeof(output_buffer)); return IOS_Ioctl(dev_uhs_0_handle, 0x15, request_buffer, sizeof(request_buffer), output_buffer, sizeof(output_buffer));
} }
int ExecuteIOSExploit() { int ExecuteIOSExploit() {
int iosuhaxFd = IOS_Open("/dev/iosuhax", 0); int iosuhaxFd = IOS_Open("/dev/iosuhax", 0);
if(iosuhaxFd >= 0) { if (iosuhaxFd >= 0) {
int dummy = 0; int dummy = 0;
//IOS_Ioctl(iosuhaxFd, 0x03, &dummy, sizeof(dummy), &dummy, sizeof(dummy)); //IOS_Ioctl(iosuhaxFd, 0x03, &dummy, sizeof(dummy), &dummy, sizeof(dummy));
@ -355,7 +356,7 @@ int ExecuteIOSExploit() {
//! execute exploit //! execute exploit
int dev_uhs_0_handle = IOS_Open("/dev/uhs/0", 0); int dev_uhs_0_handle = IOS_Open("/dev/uhs/0", 0);
if(dev_uhs_0_handle < 0) { if (dev_uhs_0_handle < 0) {
return dev_uhs_0_handle; return dev_uhs_0_handle;
} }

57
source/ios_kernel/source/elf_patcher.c
View File

@ -25,86 +25,71 @@
#include "elf_abi.h" #include "elf_abi.h"
#include "utils.h" #include "utils.h"
static Elf32_Phdr * get_section(u32 data, u32 vaddr) static Elf32_Phdr *get_section(u32 data, u32 vaddr) {
{
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) data; Elf32_Ehdr *ehdr = (Elf32_Ehdr *) data;
if ( !IS_ELF (*ehdr) if (!IS_ELF (*ehdr)
|| (ehdr->e_type != ET_EXEC) || (ehdr->e_type != ET_EXEC)
|| (ehdr->e_machine != EM_ARM)) || (ehdr->e_machine != EM_ARM)) {
{
return 0; return 0;
} }
Elf32_Phdr *phdr = 0; Elf32_Phdr *phdr = 0;
u32 i; u32 i;
for(i = 0; i < ehdr->e_phnum; i++) for (i = 0; i < ehdr->e_phnum; i++) {
{
phdr = (Elf32_Phdr *) (data + ehdr->e_phoff + ehdr->e_phentsize * i); phdr = (Elf32_Phdr *) (data + ehdr->e_phoff + ehdr->e_phentsize * i);
if((vaddr >= phdr[0].p_vaddr) && ((i == ehdr->e_phnum) || (vaddr < phdr[1].p_vaddr))) if ((vaddr >= phdr[0].p_vaddr) && ((i == ehdr->e_phnum) || (vaddr < phdr[1].p_vaddr))) {
{
break; break;
} }
} }
return phdr; return phdr;
} }
void section_write_bss(u32 ios_elf_start, u32 address, u32 size) void section_write_bss(u32 ios_elf_start, u32 address, u32 size) {
{
Elf32_Phdr *phdr = get_section(ios_elf_start, address); Elf32_Phdr *phdr = get_section(ios_elf_start, address);
if(!phdr) if (!phdr)
return; return;
if((address - phdr->p_vaddr + size) > phdr->p_memsz) if ((address - phdr->p_vaddr + size) > phdr->p_memsz) {
{
phdr->p_memsz = (address - phdr->p_vaddr + size); phdr->p_memsz = (address - phdr->p_vaddr + size);
} }
} }
void section_write(u32 ios_elf_start, u32 address, const void *data, u32 size) void section_write(u32 ios_elf_start, u32 address, const void *data, u32 size) {
{
Elf32_Phdr *phdr = get_section(ios_elf_start, address); Elf32_Phdr *phdr = get_section(ios_elf_start, address);
if(!phdr) if (!phdr)
return; return;
u32 *addr = (u32*)(ios_elf_start + address - phdr->p_vaddr + phdr->p_offset); u32 *addr = (u32 *) (ios_elf_start + address - phdr->p_vaddr + phdr->p_offset);
if((address - phdr->p_vaddr + size) > phdr->p_filesz) if ((address - phdr->p_vaddr + size) > phdr->p_filesz) {
{
u32 additionalSize = address - phdr->p_vaddr + size - phdr->p_filesz; u32 additionalSize = address - phdr->p_vaddr + size - phdr->p_filesz;
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) ios_elf_start; Elf32_Ehdr *ehdr = (Elf32_Ehdr *) ios_elf_start;
Elf32_Phdr * tmpPhdr; Elf32_Phdr *tmpPhdr;
u32 i; u32 i;
for(i = (ehdr->e_phnum-1); i >= 0; i--) for (i = (ehdr->e_phnum - 1); i >= 0; i--) {
{
tmpPhdr = (Elf32_Phdr *) (ios_elf_start + ehdr->e_phoff + ehdr->e_phentsize * i); tmpPhdr = (Elf32_Phdr *) (ios_elf_start + ehdr->e_phoff + ehdr->e_phentsize * i);
if(phdr->p_offset < tmpPhdr->p_offset) if (phdr->p_offset < tmpPhdr->p_offset) {
{ reverse_memcpy((u8 *) ios_elf_start + tmpPhdr->p_offset + additionalSize, (u8 *) ios_elf_start + tmpPhdr->p_offset, tmpPhdr->p_filesz);
reverse_memcpy((u8*)ios_elf_start + tmpPhdr->p_offset + additionalSize, (u8*)ios_elf_start + tmpPhdr->p_offset, tmpPhdr->p_filesz);
tmpPhdr->p_offset += additionalSize; tmpPhdr->p_offset += additionalSize;
} } else {
else {
break; break;
} }
} }
phdr->p_filesz += additionalSize; phdr->p_filesz += additionalSize;
if(phdr->p_memsz < phdr->p_filesz) if (phdr->p_memsz < phdr->p_filesz) {
{
phdr->p_memsz = phdr->p_filesz; phdr->p_memsz = phdr->p_filesz;
} }
} }
// in most cases only a word is copied to an aligned address so do a short cut for performance // in most cases only a word is copied to an aligned address so do a short cut for performance
if(size == 4 && !((unsigned int)addr & 3) && !((unsigned int)data & 3)) if (size == 4 && !((unsigned int) addr & 3) && !((unsigned int) data & 3)) {
{ *(u32 *) addr = *(u32 *) data;
*(u32*)addr = *(u32*)data; } else {
}
else
{
kernel_memcpy(addr, data, size); kernel_memcpy(addr, data, size);
} }
} }

15
source/ios_kernel/source/elf_patcher.h
View File

@ -31,27 +31,24 @@
#define THUMB_B(addr, func) ((0xE000 | ((((u32)(func) - (u32)(addr) - 4) >> 1) & 0x7FF))) // +-2KB #define THUMB_B(addr, func) ((0xE000 | ((((u32)(func) - (u32)(addr) - 4) >> 1) & 0x7FF))) // +-2KB
#define THUMB_BL(addr, func) ((0xF000F800 | ((((u32)(func) - (u32)(addr) - 4) >> 1) & 0x0FFF)) | ((((u32)(func) - (u32)(addr) - 4) << 4) & 0x7FFF000)) // +-4MB #define THUMB_BL(addr, func) ((0xF000F800 | ((((u32)(func) - (u32)(addr) - 4) >> 1) & 0x0FFF)) | ((((u32)(func) - (u32)(addr) - 4) << 4) & 0x7FFF000)) // +-4MB
typedef struct typedef struct {
{
u32 address; u32 address;
void* data; void *data;
u32 size; u32 size;
} patch_table_t; } patch_table_t;
void section_write(u32 ios_elf_start, u32 address, const void *data, u32 size); void section_write(u32 ios_elf_start, u32 address, const void *data, u32 size);
void section_write_bss(u32 ios_elf_start, u32 address, u32 size); void section_write_bss(u32 ios_elf_start, u32 address, u32 size);
static inline void section_write_word(u32 ios_elf_start, u32 address, u32 word) static inline void section_write_word(u32 ios_elf_start, u32 address, u32 word) {
{
section_write(ios_elf_start, address, &word, sizeof(word)); section_write(ios_elf_start, address, &word, sizeof(word));
} }
static inline void patch_table_entries(u32 ios_elf_start, const patch_table_t * patch_table, u32 patch_count) static inline void patch_table_entries(u32 ios_elf_start, const patch_table_t *patch_table, u32 patch_count) {
{
u32 i; u32 i;
for(i = 0; i < patch_count; i++) for (i = 0; i < patch_count; i++) {
{
section_write(ios_elf_start, patch_table[i].address, patch_table[i].data, patch_table[i].size); section_write(ios_elf_start, patch_table[i].address, patch_table[i].data, patch_table[i].size);
} }
} }

28
source/ios_kernel/source/exception_handler.c
View File

@ -24,39 +24,29 @@
#include "text.h" #include "text.h"
#include "types.h" #include "types.h"
void crash_handler(unsigned int *context, int type) void crash_handler(unsigned int *context, int type) {
{
clearScreen(0xFFFFFFFF); clearScreen(0xFFFFFFFF);
if(type == 0) if (type == 0) {
{
_printf(0, 0, "GURU MEDITATION ERROR (prefetch abort)"); _printf(0, 0, "GURU MEDITATION ERROR (prefetch abort)");
} } else if (type == 1) {
else if(type == 1)
{
_printf(0, 0, "GURU MEDITATION ERROR (data abort)"); _printf(0, 0, "GURU MEDITATION ERROR (data abort)");
} } else {
else
{
_printf(0, 0, "GURU MEDITATION ERROR (undefined instruction)"); _printf(0, 0, "GURU MEDITATION ERROR (undefined instruction)");
} }
int reg = 0; int reg = 0;
while(reg < 16) while (reg < 16) {
{ if (reg < 10) {
if(reg < 10)
{
_printf(20, 40 + reg * 20, "r%d = %08X", reg, context[1 + reg]); _printf(20, 40 + reg * 20, "r%d = %08X", reg, context[1 + reg]);
} } else {
else
{
_printf(20, 40 + reg * 20, "r%d = %08X", reg, context[1 + reg]); _printf(20, 40 + reg * 20, "r%d = %08X", reg, context[1 + reg]);
} }
reg++; reg++;
} }
_printf(400, 20, "%08X", *(u32*)context[0x10]); _printf(400, 20, "%08X", *(u32 *) context[0x10]);
for(;;); for (;;);
} }

9
source/ios_kernel/source/exception_handler.h
View File

@ -26,18 +26,15 @@
void crash_handler(unsigned int *context, int type); void crash_handler(unsigned int *context, int type);
static inline void crash_handler_prefetch(unsigned int *context, int unused1, int unused2) static inline void crash_handler_prefetch(unsigned int *context, int unused1, int unused2) {
{
crash_handler(context, 0); crash_handler(context, 0);
} }
static inline void crash_handler_data(unsigned int *context, int unused1, int unused2) static inline void crash_handler_data(unsigned int *context, int unused1, int unused2) {
{
crash_handler(context, 1); crash_handler(context, 1);
} }
static inline void crash_handler_undef_instr(unsigned int *context, int unused1, int unused2) static inline void crash_handler_undef_instr(unsigned int *context, int unused1, int unused2) {
{
crash_handler(context, 2); crash_handler(context, 2);
} }

102
source/ios_kernel/source/fsa.c
View File

@ -32,31 +32,27 @@
#define svcIoctl ((int (*)(int fd, u32 request, void* input_buffer, u32 input_buffer_len, void* output_buffer, u32 output_buffer_len))0x081290E0) #define svcIoctl ((int (*)(int fd, u32 request, void* input_buffer, u32 input_buffer_len, void* output_buffer, u32 output_buffer_len))0x081290E0)
#define svcIoctlv ((int (*)(int fd, u32 request, u32 vector_count_in, u32 vector_count_out, iovec_s* vector))0x0812903C) #define svcIoctlv ((int (*)(int fd, u32 request, u32 vector_count_in, u32 vector_count_out, iovec_s* vector))0x0812903C)
typedef struct typedef struct {
{ void *ptr;
void* ptr;
u32 len; u32 len;
u32 unk; u32 unk;
}iovec_s; } iovec_s;
static void* allocIobuf() static void *allocIobuf() {
{ void *ptr = svcAlloc(0xCAFF, 0x828);
void* ptr = svcAlloc(0xCAFF, 0x828);
kernel_memset(ptr, 0x00, 0x828); kernel_memset(ptr, 0x00, 0x828);
return ptr; return ptr;
} }
static void freeIobuf(void* ptr) static void freeIobuf(void *ptr) {
{
svcFree(0xCAFF, ptr); svcFree(0xCAFF, ptr);
} }
static int IOS_Open(const char * dev, int mode) static int IOS_Open(const char *dev, int mode) {
{
// put string into a good location // put string into a good location
char* devStr = (char*)svcAlloc(0xCAFF, 0x20); char *devStr = (char *) svcAlloc(0xCAFF, 0x20);
if(!devStr) if (!devStr)
return -3; return -3;
kernel_strncpy(devStr, dev, 0x20); kernel_strncpy(devStr, dev, 0x20);
@ -68,37 +64,33 @@ static int IOS_Open(const char * dev, int mode)
return res; return res;
} }
static int FSA_Open(void) static int FSA_Open(void) {
{
return IOS_Open("/dev/fsa", 0); return IOS_Open("/dev/fsa", 0);
} }
static int FSA_Close(int fd) static int FSA_Close(int fd) {
{
return svcClose(fd); return svcClose(fd);
} }
static int FSA_RawOpen(int fd, const char* device_path, int* outHandle) static int FSA_RawOpen(int fd, const char *device_path, int *outHandle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
kernel_strncpy((char*)&inbuf[0x01], device_path, 0x27F); kernel_strncpy((char *) &inbuf[0x01], device_path, 0x27F);
int ret = svcIoctl(fd, 0x6A, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x6A, inbuf, 0x520, outbuf, 0x293);
if(outHandle) *outHandle = outbuf[1]; if (outHandle) *outHandle = outbuf[1];
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
static int FSA_RawClose(int fd, int device_handle) static int FSA_RawClose(int fd, int device_handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = device_handle; inbuf[1] = device_handle;
@ -108,14 +100,13 @@ static int FSA_RawClose(int fd, int device_handle)
return ret; return ret;
} }
static int FSA_RawRead(int fd, void* data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) static int FSA_RawRead(int fd, void *data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u8 *inbuf8 = iobuf;
u8* inbuf8 = iobuf; u8 *outbuf8 = &iobuf[0x520];
u8* outbuf8 = &iobuf[0x520]; iovec_s *iovec = (iovec_s *) &iobuf[0x7C0];
iovec_s* iovec = (iovec_s*)&iobuf[0x7C0]; u32 *inbuf = (u32 *) inbuf8;
u32* inbuf = (u32*)inbuf8; u32 *outbuf = (u32 *) outbuf8;
u32* outbuf = (u32*)outbuf8;
// note : offset_bytes = blocks_offset * size_bytes // note : offset_bytes = blocks_offset * size_bytes
inbuf[0x08 / 4] = (blocks_offset >> 32); inbuf[0x08 / 4] = (blocks_offset >> 32);
@ -139,14 +130,13 @@ static int FSA_RawRead(int fd, void* data, u32 size_bytes, u32 cnt, u64 blocks_o
return ret; return ret;
} }
static int FSA_RawWrite(int fd, void* data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) static int FSA_RawWrite(int fd, void *data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u8 *inbuf8 = iobuf;
u8* inbuf8 = iobuf; u8 *outbuf8 = &iobuf[0x520];
u8* outbuf8 = &iobuf[0x520]; iovec_s *iovec = (iovec_s *) &iobuf[0x7C0];
iovec_s* iovec = (iovec_s*)&iobuf[0x7C0]; u32 *inbuf = (u32 *) inbuf8;
u32* inbuf = (u32*)inbuf8; u32 *outbuf = (u32 *) outbuf8;
u32* outbuf = (u32*)outbuf8;
inbuf[0x08 / 4] = (blocks_offset >> 32); inbuf[0x08 / 4] = (blocks_offset >> 32);
inbuf[0x0C / 4] = (blocks_offset & 0xFFFFFFFF); inbuf[0x0C / 4] = (blocks_offset & 0xFFFFFFFF);
@ -169,23 +159,20 @@ static int FSA_RawWrite(int fd, void* data, u32 size_bytes, u32 cnt, u64 blocks_
return ret; return ret;
} }
int FSA_SDReadRawSectors(void *buffer, u32 sector, u32 num_sectors) int FSA_SDReadRawSectors(void *buffer, u32 sector, u32 num_sectors) {
{
int fsa = FSA_Open(); int fsa = FSA_Open();
if(fsa < 0) if (fsa < 0)
return fsa; return fsa;
int fd; int fd;
int res = FSA_RawOpen(fsa, "/dev/sdcard01", &fd); int res = FSA_RawOpen(fsa, "/dev/sdcard01", &fd);
if(res < 0) if (res < 0) {
{
FSA_Close(fsa); FSA_Close(fsa);
return res; return res;
} }
void *buf = svcAllocAlign(0xCAFF, num_sectors << 9, 0x40); void *buf = svcAllocAlign(0xCAFF, num_sectors << 9, 0x40);
if(!buf) if (!buf) {
{
FSA_RawClose(fsa, fd); FSA_RawClose(fsa, fd);
FSA_Close(fsa); FSA_Close(fsa);
return -2; return -2;
@ -202,23 +189,20 @@ int FSA_SDReadRawSectors(void *buffer, u32 sector, u32 num_sectors)
return res; return res;
} }
int FSA_SDWriteRawSectors(const void *buffer, u32 sector, u32 num_sectors) int FSA_SDWriteRawSectors(const void *buffer, u32 sector, u32 num_sectors) {
{
int fsa = FSA_Open(); int fsa = FSA_Open();
if(fsa < 0) if (fsa < 0)
return fsa; return fsa;
int fd; int fd;
int res = FSA_RawOpen(fsa, "/dev/sdcard01", &fd); int res = FSA_RawOpen(fsa, "/dev/sdcard01", &fd);
if(res < 0) if (res < 0) {
{
FSA_Close(fsa); FSA_Close(fsa);
return res; return res;
} }
void *buf = svcAllocAlign(0xCAFF, num_sectors << 9, 0x40); void *buf = svcAllocAlign(0xCAFF, num_sectors << 9, 0x40);
if(!buf) if (!buf) {
{
FSA_RawClose(fsa, fd); FSA_RawClose(fsa, fd);
FSA_Close(fsa); FSA_Close(fsa);
return -2; return -2;

9
source/ios_kernel/source/fsa.h
View File

@ -37,20 +37,19 @@
#define NAND_DESC_TYPE_SEEPROM 0x45455052 // 'EEPR' #define NAND_DESC_TYPE_SEEPROM 0x45455052 // 'EEPR'
#define NAND_DESC_TYPE_OTP 0x4f545020 // 'OTP ' #define NAND_DESC_TYPE_OTP 0x4f545020 // 'OTP '
typedef struct _stdio_nand_desc_t typedef struct _stdio_nand_desc_t {
{
u32 nand_type; // nand type u32 nand_type; // nand type
u32 base_sector; // base sector of dump u32 base_sector; // base sector of dump
u32 sector_count; // sector count in SDIO sectors u32 sector_count; // sector count in SDIO sectors
} __attribute__((packed))stdio_nand_desc_t; } __attribute__((packed)) stdio_nand_desc_t;
typedef struct _sdio_nand_signature_sector_t typedef struct _sdio_nand_signature_sector_t {
{
u64 signature; // HAXXDUMP u64 signature; // HAXXDUMP
stdio_nand_desc_t nand_descriptions[NAND_MAX_DESC_TYPES]; stdio_nand_desc_t nand_descriptions[NAND_MAX_DESC_TYPES];
} __attribute__((packed)) sdio_nand_signature_sector_t; } __attribute__((packed)) sdio_nand_signature_sector_t;
int FSA_SDReadRawSectors(void *buffer, u32 sector, u32 num_sectors); int FSA_SDReadRawSectors(void *buffer, u32 sector, u32 num_sectors);
int FSA_SDWriteRawSectors(const void *buffer, u32 sector, u32 num_sectors); int FSA_SDWriteRawSectors(const void *buffer, u32 sector, u32 num_sectors);
#endif #endif

38
source/ios_kernel/source/instant_patches.c
View File

@ -43,33 +43,33 @@ typedef struct {
void instant_patches_setup(void) { void instant_patches_setup(void) {
// apply IOS ELF launch hook // apply IOS ELF launch hook
*(volatile u32*)0x0812A120 = ARM_BL(0x0812A120, kernel_launch_ios); *(volatile u32 *) 0x0812A120 = ARM_BL(0x0812A120, kernel_launch_ios);
// patch FSA raw access // patch FSA raw access
*(volatile u32*)0x1070FAE8 = 0x05812070; *(volatile u32 *) 0x1070FAE8 = 0x05812070;
*(volatile u32*)0x1070FAEC = 0xEAFFFFF9; *(volatile u32 *) 0x1070FAEC = 0xEAFFFFF9;
int (*_iosMapSharedUserExecution)(void *descr) = (void*)0x08124F88; int (*_iosMapSharedUserExecution)(void *descr) = (void *) 0x08124F88;
// patch kernel dev node registration // patch kernel dev node registration
*(volatile u32*)0x081430B4 = 1; *(volatile u32 *) 0x081430B4 = 1;
// fix 10 minute timeout that crashes MCP after 10 minutes of booting // fix 10 minute timeout that crashes MCP after 10 minutes of booting
*(volatile u32*)(0x05022474 - 0x05000000 + 0x081C0000) = 0xFFFFFFFF; // NEW_TIMEOUT *(volatile u32 *) (0x05022474 - 0x05000000 + 0x081C0000) = 0xFFFFFFFF; // NEW_TIMEOUT
// start our MCP thread directly on first title change // start our MCP thread directly on first title change
kernel_memset((void*)(0x050BD000 - 0x05000000 + 0x081C0000), 0, 0x3000); kernel_memset((void *) (0x050BD000 - 0x05000000 + 0x081C0000), 0, 0x3000);
*(volatile u32*)(0x05054D6C - 0x05000000 + 0x081C0000) = ARM_B(0x05054D6C, _startMainThread); *(volatile u32 *) (0x05054D6C - 0x05000000 + 0x081C0000) = ARM_B(0x05054D6C, _startMainThread);
// allow custom bootLogoTex and bootMovie.h264 // allow custom bootLogoTex and bootMovie.h264
*(volatile u32*)(0xE0030D68 - 0xE0000000 + 0x12900000) = 0xE3A00000; // mov r0, #0 *(volatile u32 *) (0xE0030D68 - 0xE0000000 + 0x12900000) = 0xE3A00000; // mov r0, #0
*(volatile u32*)(0xE0030D34 - 0xE0000000 + 0x12900000) = 0xE3A00000; // mov r0, #0 *(volatile u32 *) (0xE0030D34 - 0xE0000000 + 0x12900000) = 0xE3A00000; // mov r0, #0
// allow any region title launch // allow any region title launch
*(volatile u32*)(0xE0030498 - 0xE0000000 + 0x12900000) = 0xE3A00000; // mov r0, #0 *(volatile u32 *) (0xE0030498 - 0xE0000000 + 0x12900000) = 0xE3A00000; // mov r0, #0
*(volatile u32*)(0x050254D6 - 0x05000000 + 0x081C0000) = (volatile u32*)THUMB_BL(0x050254D6, MCP_LoadFile_patch); *(volatile u32 *) (0x050254D6 - 0x05000000 + 0x081C0000) = (volatile u32 *) THUMB_BL(0x050254D6, MCP_LoadFile_patch);
*(volatile u32*)(0x05025242 - 0x05000000 + 0x081C0000) = (volatile u32*)THUMB_BL(0x05025242, MCP_ioctl100_patch); *(volatile u32 *) (0x05025242 - 0x05000000 + 0x081C0000) = (volatile u32 *) THUMB_BL(0x05025242, MCP_ioctl100_patch);
// change system.xml to syshax.xml // change system.xml to syshax.xml
/* /*
@ -81,19 +81,19 @@ void instant_patches_setup(void) {
*/ */
// patch default title id to system menu // patch default title id to system menu
*(volatile u32*)mcp_data_phys(0x050B817C) = *(volatile u32*)0x0017FFF0; *(volatile u32 *) mcp_data_phys(0x050B817C) = *(volatile u32 *) 0x0017FFF0;
*(volatile u32*)mcp_data_phys(0x050B8180) = *(volatile u32*)0x0017FFF4; *(volatile u32 *) mcp_data_phys(0x050B8180) = *(volatile u32 *) 0x0017FFF4;
// force check USB storage on load // force check USB storage on load
*(volatile u32*)acp_phys(0xE012202C) = 0x00000001; // find USB flag *(volatile u32 *) acp_phys(0xE012202C) = 0x00000001; // find USB flag
// set zero to start thread directly on first title change // set zero to start thread directly on first title change
*(volatile u32*)(0x050BC580 - 0x05000000 + 0x081C0000) = 0; *(volatile u32 *) (0x050BC580 - 0x05000000 + 0x081C0000) = 0;
// down display launch image at this state // down display launch image at this state
*(volatile u32*)(_text_start - 4 - 0x05100000 + 0x13D80000) = 0; *(volatile u32 *) (_text_start - 4 - 0x05100000 + 0x13D80000) = 0;
// patch the read position for the cos xml's p4.mask(ios_fs) to read 0xFFFFFFFFFFFFFFFF // patch the read position for the cos xml's p4.mask(ios_fs) to read 0xFFFFFFFFFFFFFFFF
*(volatile u32*)(0x05002BBE - 0x05000000 + 0x081C0000) = (volatile u32*)THUMB_BL(0x05002BBE, patch_SD_access_check); *(volatile u32 *) (0x05002BBE - 0x05000000 + 0x081C0000) = (volatile u32 *) THUMB_BL(0x05002BBE, patch_SD_access_check);
ios_map_shared_info_t map_info; ios_map_shared_info_t map_info;
map_info.paddr = 0x050BD000 - 0x05000000 + 0x081C0000; map_info.paddr = 0x050BD000 - 0x05000000 + 0x081C0000;

10
source/ios_kernel/source/ios_mcp_patches.c
View File

@ -32,22 +32,20 @@
extern const patch_table_t mcp_patches_table[]; extern const patch_table_t mcp_patches_table[];
extern const patch_table_t mcp_patches_table_end[]; extern const patch_table_t mcp_patches_table_end[];
u32 mcp_get_phys_code_base(void) u32 mcp_get_phys_code_base(void) {
{
return _text_start + MCP_CODE_BASE_PHYS_ADDR; return _text_start + MCP_CODE_BASE_PHYS_ADDR;
} }
void mcp_run_patches(u32 ios_elf_start) void mcp_run_patches(u32 ios_elf_start) {
{
// write ios_mcp code and bss // write ios_mcp code and bss
section_write_bss(ios_elf_start, _bss_start, _bss_end - _bss_start); section_write_bss(ios_elf_start, _bss_start, _bss_end - _bss_start);
section_write(ios_elf_start, _text_start, (void*)mcp_get_phys_code_base(), _text_end - _text_start); section_write(ios_elf_start, _text_start, (void *) mcp_get_phys_code_base(), _text_end - _text_start);
section_write_word(ios_elf_start, 0x05056718, ARM_BL(0x05056718, _text_start)); section_write_word(ios_elf_start, 0x05056718, ARM_BL(0x05056718, _text_start));
section_write_word(ios_elf_start, 0x05002BBE, THUMB_BL(0x05002BBE, patch_SD_access_check)); section_write_word(ios_elf_start, 0x05002BBE, THUMB_BL(0x05002BBE, patch_SD_access_check));
u32 patch_count = (u32)(((u8*)mcp_patches_table_end) - ((u8*)mcp_patches_table)) / sizeof(patch_table_t); u32 patch_count = (u32) (((u8 *) mcp_patches_table_end) - ((u8 *) mcp_patches_table)) / sizeof(patch_table_t);
patch_table_entries(ios_elf_start, mcp_patches_table, patch_count); patch_table_entries(ios_elf_start, mcp_patches_table, patch_count);
section_write_word(ios_elf_start, 0x050254D6, THUMB_BL(0x050254D6, MCP_LoadFile_patch)); section_write_word(ios_elf_start, 0x050254D6, THUMB_BL(0x050254D6, MCP_LoadFile_patch));

1
source/ios_kernel/source/ios_mcp_patches.h
View File

@ -27,6 +27,7 @@
#define MCP_LAUNCH_IMG_PHYS_ADDR (0x27000000) #define MCP_LAUNCH_IMG_PHYS_ADDR (0x27000000)
u32 mcp_get_phys_code_base(void); u32 mcp_get_phys_code_base(void);
void mcp_run_patches(u32 ios_elf_start); void mcp_run_patches(u32 ios_elf_start);
#endif #endif

50
source/ios_kernel/source/kernel_patches.c
View File

@ -31,47 +31,42 @@
#include "utils.h" #include "utils.h"
extern void __KERNEL_CODE_START(void); extern void __KERNEL_CODE_START(void);
extern void __KERNEL_CODE_END(void); extern void __KERNEL_CODE_END(void);
extern const patch_table_t kernel_patches_table[]; extern const patch_table_t kernel_patches_table[];
extern const patch_table_t kernel_patches_table_end[]; extern const patch_table_t kernel_patches_table_end[];
static const u32 mcpIoMappings_patch[] = static const u32 mcpIoMappings_patch[] =
{ {
// vaddr paddr size ? ? ? // vaddr paddr size ? ? ?
0x0D000000, 0x0D000000, 0x001C0000, 0x00000000, 0x00000003, 0x00000000, // mapping 1 0x0D000000, 0x0D000000, 0x001C0000, 0x00000000, 0x00000003, 0x00000000, // mapping 1
0x0D800000, 0x0D800000, 0x001C0000, 0x00000000, 0x00000003, 0x00000000, // mapping 2 0x0D800000, 0x0D800000, 0x001C0000, 0x00000000, 0x00000003, 0x00000000, // mapping 2
0x0C200000, 0x0C200000, 0x00100000, 0x00000000, 0x00000003, 0x00000000 // mapping 3 0x0C200000, 0x0C200000, 0x00100000, 0x00000000, 0x00000003, 0x00000000 // mapping 3
}; };
static const u32 KERNEL_MCP_IOMAPPINGS_STRUCT[] = static const u32 KERNEL_MCP_IOMAPPINGS_STRUCT[] =
{ {
(u32)mcpIoMappings_patch, // ptr to iomapping structs (u32) mcpIoMappings_patch, // ptr to iomapping structs
0x00000003, // number of iomappings 0x00000003, // number of iomappings
0x00000001 // pid (MCP) 0x00000001 // pid (MCP)
}; };
static int kernel_syscall_0x81(u32 command, u32 arg1, u32 arg2, u32 arg3) static int kernel_syscall_0x81(u32 command, u32 arg1, u32 arg2, u32 arg3) {
{ switch (command) {
switch(command) case KERNEL_READ32: {
{ return *(volatile u32 *) arg1;
case KERNEL_READ32:
{
return *(volatile u32*)arg1;
} }
case KERNEL_WRITE32: case KERNEL_WRITE32: {
{ *(volatile u32 *) arg1 = arg2;
*(volatile u32*)arg1 = arg2;
break; break;
} }
case KERNEL_MEMCPY: case KERNEL_MEMCPY: {
{
//set_domain_register(0xFFFFFFFF); //set_domain_register(0xFFFFFFFF);
kernel_memcpy((void*)arg1, (void*) arg2, arg3); kernel_memcpy((void *) arg1, (void *) arg2, arg3);
break; break;
} }
case KERNEL_GET_CFW_CONFIG: case KERNEL_GET_CFW_CONFIG: {
{
//set_domain_register(0xFFFFFFFF); //set_domain_register(0xFFFFFFFF);
//kernel_memcpy((void*)arg1, &cfw_config, sizeof(cfw_config)); //kernel_memcpy((void*)arg1, &cfw_config, sizeof(cfw_config));
break; break;
@ -82,12 +77,10 @@ static int kernel_syscall_0x81(u32 command, u32 arg1, u32 arg2, u32 arg3)
return 0; return 0;
} }
void kernel_launch_ios(u32 launch_address, u32 L, u32 C, u32 H) void kernel_launch_ios(u32 launch_address, u32 L, u32 C, u32 H) {
{ void (*kernel_launch_bootrom)(u32 launch_address, u32 L, u32 C, u32 H) = (void *) 0x0812A050;
void (*kernel_launch_bootrom)(u32 launch_address, u32 L, u32 C, u32 H) = (void*)0x0812A050;
if(*(u32*)(launch_address - 0x300 + 0x1AC) == 0x00DFD000) if (*(u32 *) (launch_address - 0x300 + 0x1AC) == 0x00DFD000) {
{
int level = disable_interrupts(); int level = disable_interrupts();
unsigned int control_register = disable_mmu(); unsigned int control_register = disable_mmu();
@ -104,9 +97,8 @@ void kernel_launch_ios(u32 launch_address, u32 L, u32 C, u32 H)
kernel_launch_bootrom(launch_address, L, C, H); kernel_launch_bootrom(launch_address, L, C, H);
} }
void kernel_run_patches(u32 ios_elf_start) void kernel_run_patches(u32 ios_elf_start) {
{ section_write(ios_elf_start, (u32) __KERNEL_CODE_START, __KERNEL_CODE_START, __KERNEL_CODE_END - __KERNEL_CODE_START);
section_write(ios_elf_start, (u32)__KERNEL_CODE_START, __KERNEL_CODE_START, __KERNEL_CODE_END - __KERNEL_CODE_START);
section_write_word(ios_elf_start, 0x0812A120, ARM_BL(0x0812A120, kernel_launch_ios)); section_write_word(ios_elf_start, 0x0812A120, ARM_BL(0x0812A120, kernel_launch_ios));
section_write(ios_elf_start, 0x08140DE0, KERNEL_MCP_IOMAPPINGS_STRUCT, sizeof(KERNEL_MCP_IOMAPPINGS_STRUCT)); section_write(ios_elf_start, 0x08140DE0, KERNEL_MCP_IOMAPPINGS_STRUCT, sizeof(KERNEL_MCP_IOMAPPINGS_STRUCT));
@ -117,7 +109,7 @@ void kernel_run_patches(u32 ios_elf_start)
section_write_word(ios_elf_start, 0x0812CD2C, ARM_B(0x0812CD2C, kernel_syscall_0x81)); section_write_word(ios_elf_start, 0x0812CD2C, ARM_B(0x0812CD2C, kernel_syscall_0x81));
u32 patch_count = (u32)(((u8*)kernel_patches_table_end) - ((u8*)kernel_patches_table)) / sizeof(patch_table_t); u32 patch_count = (u32) (((u8 *) kernel_patches_table_end) - ((u8 *) kernel_patches_table)) / sizeof(patch_table_t);
patch_table_entries(ios_elf_start, kernel_patches_table, patch_count); patch_table_entries(ios_elf_start, kernel_patches_table, patch_count);
} }

2
source/ios_kernel/source/kernel_patches.h
View File

@ -25,7 +25,9 @@
#define _KERNEL_PATCHES_H #define _KERNEL_PATCHES_H
int kernel_init_otp_buffer(u32 sd_sector, int tagValid); int kernel_init_otp_buffer(u32 sd_sector, int tagValid);
void kernel_launch_ios(u32 launch_address, u32 L, u32 C, u32 H); void kernel_launch_ios(u32 launch_address, u32 L, u32 C, u32 H);
void kernel_run_patches(u32 ios_elf_start); void kernel_run_patches(u32 ios_elf_start);
#endif #endif

72
source/ios_kernel/source/main.c
View File

@ -28,41 +28,39 @@
#define USB_PHYS_CODE_BASE 0x101312D0 #define USB_PHYS_CODE_BASE 0x101312D0
typedef struct typedef struct {
{
u32 size; u32 size;
u8 data[0]; u8 data[0];
} payload_info_t; } payload_info_t;
static const char repairData_set_fault_behavior[] = { static const char repairData_set_fault_behavior[] = {
0xE1,0x2F,0xFF,0x1E,0xE9,0x2D,0x40,0x30,0xE5,0x93,0x20,0x00,0xE1,0xA0,0x40,0x00, 0xE1, 0x2F, 0xFF, 0x1E, 0xE9, 0x2D, 0x40, 0x30, 0xE5, 0x93, 0x20, 0x00, 0xE1, 0xA0, 0x40, 0x00,
0xE5,0x92,0x30,0x54,0xE1,0xA0,0x50,0x01,0xE3,0x53,0x00,0x01,0x0A,0x00,0x00,0x02, 0xE5, 0x92, 0x30, 0x54, 0xE1, 0xA0, 0x50, 0x01, 0xE3, 0x53, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x02,
0xE1,0x53,0x00,0x00,0xE3,0xE0,0x00,0x00,0x18,0xBD,0x80,0x30,0xE3,0x54,0x00,0x0D, 0xE1, 0x53, 0x00, 0x00, 0xE3, 0xE0, 0x00, 0x00, 0x18, 0xBD, 0x80, 0x30, 0xE3, 0x54, 0x00, 0x0D,
}; };
static const char repairData_set_panic_behavior[] = { static const char repairData_set_panic_behavior[] = {
0x08,0x16,0x6C,0x00,0x00,0x00,0x18,0x0C,0x08,0x14,0x40,0x00,0x00,0x00,0x9D,0x70, 0x08, 0x16, 0x6C, 0x00, 0x00, 0x00, 0x18, 0x0C, 0x08, 0x14, 0x40, 0x00, 0x00, 0x00, 0x9D, 0x70,
0x08,0x16,0x84,0x0C,0x00,0x00,0xB4,0x0C,0x00,0x00,0x01,0x01,0x08,0x14,0x40,0x00, 0x08, 0x16, 0x84, 0x0C, 0x00, 0x00, 0xB4, 0x0C, 0x00, 0x00, 0x01, 0x01, 0x08, 0x14, 0x40, 0x00,
0x08,0x15,0x00,0x00,0x08,0x17,0x21,0x80,0x08,0x17,0x38,0x00,0x08,0x14,0x30,0xD4, 0x08, 0x15, 0x00, 0x00, 0x08, 0x17, 0x21, 0x80, 0x08, 0x17, 0x38, 0x00, 0x08, 0x14, 0x30, 0xD4,
0x08,0x14,0x12,0x50,0x08,0x14,0x12,0x94,0xE3,0xA0,0x35,0x36,0xE5,0x93,0x21,0x94, 0x08, 0x14, 0x12, 0x50, 0x08, 0x14, 0x12, 0x94, 0xE3, 0xA0, 0x35, 0x36, 0xE5, 0x93, 0x21, 0x94,
0xE3,0xC2,0x2E,0x21,0xE5,0x83,0x21,0x94,0xE5,0x93,0x11,0x94,0xE1,0x2F,0xFF,0x1E, 0xE3, 0xC2, 0x2E, 0x21, 0xE5, 0x83, 0x21, 0x94, 0xE5, 0x93, 0x11, 0x94, 0xE1, 0x2F, 0xFF, 0x1E,
0xE5,0x9F,0x30,0x1C,0xE5,0x9F,0xC0,0x1C,0xE5,0x93,0x20,0x00,0xE1,0xA0,0x10,0x00, 0xE5, 0x9F, 0x30, 0x1C, 0xE5, 0x9F, 0xC0, 0x1C, 0xE5, 0x93, 0x20, 0x00, 0xE1, 0xA0, 0x10, 0x00,
0xE5,0x92,0x30,0x54,0xE5,0x9C,0x00,0x00, 0xE5, 0x92, 0x30, 0x54, 0xE5, 0x9C, 0x00, 0x00,
}; };
static const char repairData_usb_root_thread[] = { static const char repairData_usb_root_thread[] = {
0xE5,0x8D,0xE0,0x04,0xE5,0x8D,0xC0,0x08,0xE5,0x8D,0x40,0x0C,0xE5,0x8D,0x60,0x10, 0xE5, 0x8D, 0xE0, 0x04, 0xE5, 0x8D, 0xC0, 0x08, 0xE5, 0x8D, 0x40, 0x0C, 0xE5, 0x8D, 0x60, 0x10,
0xEB,0x00,0xB2,0xFD,0xEA,0xFF,0xFF,0xC9,0x10,0x14,0x03,0xF8,0x10,0x62,0x4D,0xD3, 0xEB, 0x00, 0xB2, 0xFD, 0xEA, 0xFF, 0xFF, 0xC9, 0x10, 0x14, 0x03, 0xF8, 0x10, 0x62, 0x4D, 0xD3,
0x10,0x14,0x50,0x00,0x10,0x14,0x50,0x20,0x10,0x14,0x00,0x00,0x10,0x14,0x00,0x90, 0x10, 0x14, 0x50, 0x00, 0x10, 0x14, 0x50, 0x20, 0x10, 0x14, 0x00, 0x00, 0x10, 0x14, 0x00, 0x90,
0x10,0x14,0x00,0x70,0x10,0x14,0x00,0x98,0x10,0x14,0x00,0x84,0x10,0x14,0x03,0xE8, 0x10, 0x14, 0x00, 0x70, 0x10, 0x14, 0x00, 0x98, 0x10, 0x14, 0x00, 0x84, 0x10, 0x14, 0x03, 0xE8,
0x10,0x14,0x00,0x3C,0x00,0x00,0x01,0x73,0x00,0x00,0x01,0x76,0xE9,0x2D,0x4F,0xF0, 0x10, 0x14, 0x00, 0x3C, 0x00, 0x00, 0x01, 0x73, 0x00, 0x00, 0x01, 0x76, 0xE9, 0x2D, 0x4F, 0xF0,
0xE2,0x4D,0xDE,0x17,0xEB,0x00,0xB9,0x92,0xE3,0xA0,0x10,0x00,0xE3,0xA0,0x20,0x03, 0xE2, 0x4D, 0xDE, 0x17, 0xEB, 0x00, 0xB9, 0x92, 0xE3, 0xA0, 0x10, 0x00, 0xE3, 0xA0, 0x20, 0x03,
0xE5,0x9F,0x0E,0x68,0xEB,0x00,0xB3,0x20, 0xE5, 0x9F, 0x0E, 0x68, 0xEB, 0x00, 0xB3, 0x20,
}; };
int _main() int _main() {
{ void (*invalidate_icache)() = (void (*)()) 0x0812DCF0;
void(*invalidate_icache)() = (void(*)())0x0812DCF0; void (*invalidate_dcache)(unsigned int, unsigned int) = (void (*)()) 0x08120164;
void(*invalidate_dcache)(unsigned int, unsigned int) = (void(*)())0x08120164; void (*flush_dcache)(unsigned int, unsigned int) = (void (*)()) 0x08120160;
void(*flush_dcache)(unsigned int, unsigned int) = (void(*)())0x08120160;
flush_dcache(0x081200F0, 0x4001); // giving a size >= 0x4000 flushes all cache flush_dcache(0x081200F0, 0x4001); // giving a size >= 0x4000 flushes all cache
@ -71,32 +69,32 @@ int _main()
unsigned int control_register = disable_mmu(); unsigned int control_register = disable_mmu();
/* Save the request handle so we can reply later */ /* Save the request handle so we can reply later */
*(volatile u32*)0x0012F000 = *(volatile u32*)0x1016AD18; *(volatile u32 *) 0x0012F000 = *(volatile u32 *) 0x1016AD18;
/* Patch kernel_error_handler to BX LR immediately */ /* Patch kernel_error_handler to BX LR immediately */
*(volatile u32*)0x08129A24 = 0xE12FFF1E; *(volatile u32 *) 0x08129A24 = 0xE12FFF1E;
void * pset_fault_behavior = (void*)0x081298BC; void *pset_fault_behavior = (void *) 0x081298BC;
kernel_memcpy(pset_fault_behavior, (void*)repairData_set_fault_behavior, sizeof(repairData_set_fault_behavior)); kernel_memcpy(pset_fault_behavior, (void *) repairData_set_fault_behavior, sizeof(repairData_set_fault_behavior));
void * pset_panic_behavior = (void*)0x081296E4; void *pset_panic_behavior = (void *) 0x081296E4;
kernel_memcpy(pset_panic_behavior, (void*)repairData_set_panic_behavior, sizeof(repairData_set_panic_behavior)); kernel_memcpy(pset_panic_behavior, (void *) repairData_set_panic_behavior, sizeof(repairData_set_panic_behavior));
void * pusb_root_thread = (void*)0x10100174; void *pusb_root_thread = (void *) 0x10100174;
kernel_memcpy(pusb_root_thread, (void*)repairData_usb_root_thread, sizeof(repairData_usb_root_thread)); kernel_memcpy(pusb_root_thread, (void *) repairData_usb_root_thread, sizeof(repairData_usb_root_thread));
payload_info_t *payloads = (payload_info_t*)0x00148000; payload_info_t *payloads = (payload_info_t *) 0x00148000;
kernel_memcpy((void*)USB_PHYS_CODE_BASE, payloads->data, payloads->size); kernel_memcpy((void *) USB_PHYS_CODE_BASE, payloads->data, payloads->size);
payloads = (payload_info_t*)0x00160000; payloads = (payload_info_t *) 0x00160000;
kernel_memcpy((void*)mcp_get_phys_code_base(), payloads->data, payloads->size); kernel_memcpy((void *) mcp_get_phys_code_base(), payloads->data, payloads->size);
// run all instant patches as necessary // run all instant patches as necessary
instant_patches_setup(); instant_patches_setup();
*(volatile u32*)(0x1555500) = 0; *(volatile u32 *) (0x1555500) = 0;
/* REENABLE MMU */ /* REENABLE MMU */
restore_mmu(control_register); restore_mmu(control_register);

54
source/ios_kernel/source/text.c
View File

@ -15,40 +15,30 @@
#define CHAR_SIZE_Y 8 #define CHAR_SIZE_Y 8
u32* const framebuffer = (u32*)FRAMEBUFFER_ADDRESS; u32 *const framebuffer = (u32 *) FRAMEBUFFER_ADDRESS;
void clearScreen(u32 color) void clearScreen(u32 color) {
{
int i; int i;
for(i = 0; i < 896 * 504; i++) for (i = 0; i < 896 * 504; i++) {
{
framebuffer[i] = color; framebuffer[i] = color;
} }
} }
void drawCharacter(char c, int x, int y) void drawCharacter(char c, int x, int y) {
{ if (c < 32)return;
if(c < 32)return;
c -= 32; c -= 32;
u8* charData = (u8*)&font_bin[(int)c << 3]; u8 *charData = (u8 *) &font_bin[(int) c << 3];
u32* fb = &framebuffer[x + y * FRAMEBUFFER_STRIDE_WORDS]; u32 *fb = &framebuffer[x + y * FRAMEBUFFER_STRIDE_WORDS];
int i, j, n, k; int i, j, n, k;
for(i = 0; i < CHAR_SIZE_Y; i++) for (i = 0; i < CHAR_SIZE_Y; i++) {
{ for (k = 0; k < CHAR_MULT; k++) {
for(k = 0; k < CHAR_MULT; k++)
{
u8 v = *charData; u8 v = *charData;
for(j = 0; j < CHAR_SIZE_X; j++) for (j = 0; j < CHAR_SIZE_X; j++) {
{ for (n = 0; n < CHAR_MULT; n++) {
for(n = 0; n < CHAR_MULT; n++) if (v & 1) {
{
if(v & 1)
{
*fb = 0x00000000; *fb = 0x00000000;
} } else {
else
{
*fb = 0xFFFFFFFF; *fb = 0xFFFFFFFF;
} }
fb++; fb++;
@ -61,29 +51,25 @@ void drawCharacter(char c, int x, int y)
} }
} }
void drawString(char* str, int x, int y) void drawString(char *str, int x, int y) {
{ if (!str) return;
if(!str) return;
int k; int k;
int dx = 0, dy = 0; int dx = 0, dy = 0;
for(k = 0; str[k]; k++) for (k = 0; str[k]; k++) {
{ if (str[k] >= 32 && str[k] < 128)
if(str[k] >= 32 && str[k] < 128)
drawCharacter(str[k], x + dx, y + dy); drawCharacter(str[k], x + dx, y + dy);
dx += CHAR_SIZE_X * CHAR_MULT; dx += CHAR_SIZE_X * CHAR_MULT;
if(str[k] == '\n') if (str[k] == '\n') {
{
dx = 0; dx = 0;
dy -= CHAR_SIZE_Y * CHAR_MULT; dy -= CHAR_SIZE_Y * CHAR_MULT;
} }
} }
} }
void _printf(int x, int y, const char *format, ...) void _printf(int x, int y, const char *format, ...) {
{ void (*kernel_vsnprintf)(char *s, size_t n, const char *format, va_list arg) = (void *) 0x0813293C;
void (*kernel_vsnprintf)(char * s, size_t n, const char * format, va_list arg) = (void*)0x0813293C;
va_list args; va_list args;
va_start(args, format); va_start(args, format);

5
source/ios_kernel/source/text.h
View File

@ -4,8 +4,11 @@
#include "types.h" #include "types.h"
void drawSplashScreen(void); void drawSplashScreen(void);
void clearScreen(u32 color); void clearScreen(u32 color);
void drawString(char* str, int x, int y);
void drawString(char *str, int x, int y);
void _printf(int x, int y, const char *format, ...); void _printf(int x, int y, const char *format, ...);
#endif #endif

46
source/ios_kernel/source/utils.c
View File

@ -23,38 +23,33 @@
***************************************************************************/ ***************************************************************************/
// this memcpy is optimized for speed and to work with MEM1 32 bit access alignment requirement // this memcpy is optimized for speed and to work with MEM1 32 bit access alignment requirement
void reverse_memcpy(void* dst, const void* src, unsigned int size) void reverse_memcpy(void *dst, const void *src, unsigned int size) {
{
const unsigned char *src_p; const unsigned char *src_p;
unsigned char *dst_p; unsigned char *dst_p;
if((size >= 4) && !((dst - src) & 3)) if ((size >= 4) && !((dst - src) & 3)) {
{
const unsigned int *src_p32; const unsigned int *src_p32;
unsigned int *dst_p32; unsigned int *dst_p32;
unsigned int endDst = ((unsigned int)dst) + size; unsigned int endDst = ((unsigned int) dst) + size;
unsigned int endRest = endDst & 3; unsigned int endRest = endDst & 3;
if(endRest) if (endRest) {
{ src_p = ((const unsigned char *) (src + size)) - 1;
src_p = ((const unsigned char*)(src + size)) - 1; dst_p = ((unsigned char *) endDst) - 1;
dst_p = ((unsigned char*)endDst) - 1;
size -= endRest; size -= endRest;
while(endRest--) while (endRest--)
*dst_p-- = *src_p--; *dst_p-- = *src_p--;
} }
src_p32 = ((const unsigned int*)(src + size)) - 1; src_p32 = ((const unsigned int *) (src + size)) - 1;
dst_p32 = ((unsigned int*)(dst + size)) - 1; dst_p32 = ((unsigned int *) (dst + size)) - 1;
unsigned int size32 = size >> 5; unsigned int size32 = size >> 5;
if(size32) if (size32) {
{
size &= 0x1F; size &= 0x1F;
while(size32--) while (size32--) {
{
src_p32 -= 8; src_p32 -= 8;
dst_p32 -= 8; dst_p32 -= 8;
@ -70,23 +65,20 @@ void reverse_memcpy(void* dst, const void* src, unsigned int size)
} }
unsigned int size4 = size >> 2; unsigned int size4 = size >> 2;
if(size4) if (size4) {
{
size &= 3; size &= 3;
while(size4--) while (size4--)
*dst_p32-- = *src_p32--; *dst_p32-- = *src_p32--;
} }
dst_p = ((unsigned char*)dst_p32) + 3; dst_p = ((unsigned char *) dst_p32) + 3;
src_p = ((const unsigned char*)src_p32) + 3; src_p = ((const unsigned char *) src_p32) + 3;
} } else {
else dst_p = ((unsigned char *) dst) + size - 1;
{ src_p = ((const unsigned char *) src) + size - 1;
dst_p = ((unsigned char*)dst) + size - 1;
src_p = ((const unsigned char*)src) + size - 1;
} }
while(size--) while (size--)
*dst_p-- = *src_p--; *dst_p-- = *src_p--;
} }

11
source/ios_kernel/source/utils.h
View File

@ -33,23 +33,20 @@
#define enable_interrupts ((int(*)(int))0x0812E78C) #define enable_interrupts ((int(*)(int))0x0812E78C)
#define kernel_bsp_command_5 ((int (*)(const char*, int offset, const char*, int size, void *buffer))0x0812EC40) #define kernel_bsp_command_5 ((int (*)(const char*, int offset, const char*, int size, void *buffer))0x0812EC40)
void reverse_memcpy(void* dest, const void* src, unsigned int size); void reverse_memcpy(void *dest, const void *src, unsigned int size);
static inline unsigned int disable_mmu(void) static inline unsigned int disable_mmu(void) {
{
unsigned int control_register = 0; unsigned int control_register = 0;
asm volatile("MRC p15, 0, %0, c1, c0, 0" : "=r" (control_register)); asm volatile("MRC p15, 0, %0, c1, c0, 0" : "=r" (control_register));
asm volatile("MCR p15, 0, %0, c1, c0, 0" : : "r" (control_register & 0xFFFFEFFA)); asm volatile("MCR p15, 0, %0, c1, c0, 0" : : "r" (control_register & 0xFFFFEFFA));
return control_register; return control_register;
} }
static inline void restore_mmu(unsigned int control_register) static inline void restore_mmu(unsigned int control_register) {
{
asm volatile("MCR p15, 0, %0, c1, c0, 0" : : "r" (control_register)); asm volatile("MCR p15, 0, %0, c1, c0, 0" : : "r" (control_register));
} }
static inline void set_domain_register(unsigned int domain_register) static inline void set_domain_register(unsigned int domain_register) {
{
asm volatile("MCR p15, 0, %0, c3, c0, 0" : : "r" (domain_register)); asm volatile("MCR p15, 0, %0, c3, c0, 0" : : "r" (domain_register));
} }

287
source/ios_mcp/source/fsa.c
View File

@ -5,33 +5,30 @@
#include "imports.h" #include "imports.h"
#include "fsa.h" #include "fsa.h"
static void* allocIobuf() static void *allocIobuf() {
{ void *ptr = svcAlloc(0xCAFF, 0x828);
void* ptr = svcAlloc(0xCAFF, 0x828);
memset(ptr, 0x00, 0x828); memset(ptr, 0x00, 0x828);
return ptr; return ptr;
} }
static void freeIobuf(void* ptr) static void freeIobuf(void *ptr) {
{
svcFree(0xCAFF, ptr); svcFree(0xCAFF, ptr);
} }
int FSA_Mount(int fd, char* device_path, char* volume_path, u32 flags, char* arg_string, int arg_string_len) int FSA_Mount(int fd, char *device_path, char *volume_path, u32 flags, char *arg_string, int arg_string_len) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u8 *inbuf8 = iobuf;
u8* inbuf8 = iobuf; u8 *outbuf8 = &iobuf[0x520];
u8* outbuf8 = &iobuf[0x520]; iovec_s *iovec = (iovec_s *) &iobuf[0x7C0];
iovec_s* iovec = (iovec_s*)&iobuf[0x7C0]; u32 *inbuf = (u32 *) inbuf8;
u32* inbuf = (u32*)inbuf8; u32 *outbuf = (u32 *) outbuf8;
u32* outbuf = (u32*)outbuf8;
strncpy((char*)&inbuf8[0x04], device_path, 0x27F); strncpy((char *) &inbuf8[0x04], device_path, 0x27F);
strncpy((char*)&inbuf8[0x284], volume_path, 0x27F); strncpy((char *) &inbuf8[0x284], volume_path, 0x27F);
inbuf[0x504 / 4] = (u32)flags; inbuf[0x504 / 4] = (u32) flags;
inbuf[0x508 / 4] = (u32)arg_string_len; inbuf[0x508 / 4] = (u32) arg_string_len;
iovec[0].ptr = inbuf; iovec[0].ptr = inbuf;
iovec[0].len = 0x520; iovec[0].len = 0x520;
@ -46,13 +43,12 @@ int FSA_Mount(int fd, char* device_path, char* volume_path, u32 flags, char* arg
return ret; return ret;
} }
int FSA_Unmount(int fd, char* path, u32 flags) int FSA_Unmount(int fd, char *path, u32 flags) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
inbuf[0x284 / 4] = flags; inbuf[0x284 / 4] = flags;
int ret = svcIoctl(fd, 0x02, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x02, inbuf, 0x520, outbuf, 0x293);
@ -61,13 +57,12 @@ int FSA_Unmount(int fd, char* path, u32 flags)
return ret; return ret;
} }
int FSA_MakeDir(int fd, char* path, u32 flags) int FSA_MakeDir(int fd, char *path, u32 flags) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
inbuf[0x284 / 4] = flags; inbuf[0x284 / 4] = flags;
int ret = svcIoctl(fd, 0x07, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x07, inbuf, 0x520, outbuf, 0x293);
@ -76,43 +71,40 @@ int FSA_MakeDir(int fd, char* path, u32 flags)
return ret; return ret;
} }
int FSA_OpenDir(int fd, char* path, int* outHandle) int FSA_OpenDir(int fd, char *path, int *outHandle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
int ret = svcIoctl(fd, 0x0A, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x0A, inbuf, 0x520, outbuf, 0x293);
if(outHandle) *outHandle = outbuf[1]; if (outHandle) *outHandle = outbuf[1];
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
int FSA_ReadDir(int fd, int handle, directoryEntry_s* out_data) int FSA_ReadDir(int fd, int handle, directoryEntry_s *out_data) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = handle; inbuf[1] = handle;
int ret = svcIoctl(fd, 0x0B, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x0B, inbuf, 0x520, outbuf, 0x293);
if(out_data) memcpy(out_data, &outbuf[1], sizeof(directoryEntry_s)); if (out_data) memcpy(out_data, &outbuf[1], sizeof(directoryEntry_s));
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
int FSA_RewindDir(int fd, int handle) int FSA_RewindDir(int fd, int handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = handle; inbuf[1] = handle;
@ -122,11 +114,10 @@ int FSA_RewindDir(int fd, int handle)
return ret; return ret;
} }
int FSA_CloseDir(int fd, int handle) int FSA_CloseDir(int fd, int handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = handle; inbuf[1] = handle;
@ -136,13 +127,12 @@ int FSA_CloseDir(int fd, int handle)
return ret; return ret;
} }
int FSA_ChangeDir(int fd, char* path) int FSA_ChangeDir(int fd, char *path) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
int ret = svcIoctl(fd, 0x05, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x05, inbuf, 0x520, outbuf, 0x293);
@ -150,31 +140,29 @@ int FSA_ChangeDir(int fd, char* path)
return ret; return ret;
} }
int FSA_OpenFile(int fd, char* path, char* mode, int* outHandle) int FSA_OpenFile(int fd, char *path, char *mode, int *outHandle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
strncpy((char*)&inbuf[0xA1], mode, 0x10); strncpy((char *) &inbuf[0xA1], mode, 0x10);
int ret = svcIoctl(fd, 0x0E, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x0E, inbuf, 0x520, outbuf, 0x293);
if(outHandle) *outHandle = outbuf[1]; if (outHandle) *outHandle = outbuf[1];
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
int _FSA_ReadWriteFile(int fd, void* data, u32 size, u32 cnt, int fileHandle, u32 flags, bool read) int _FSA_ReadWriteFile(int fd, void *data, u32 size, u32 cnt, int fileHandle, u32 flags, bool read) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u8 *inbuf8 = iobuf;
u8* inbuf8 = iobuf; u8 *outbuf8 = &iobuf[0x520];
u8* outbuf8 = &iobuf[0x520]; iovec_s *iovec = (iovec_s *) &iobuf[0x7C0];
iovec_s* iovec = (iovec_s*)&iobuf[0x7C0]; u32 *inbuf = (u32 *) inbuf8;
u32* inbuf = (u32*)inbuf8; u32 *outbuf = (u32 *) outbuf8;
u32* outbuf = (u32*)outbuf8;
inbuf[0x08 / 4] = size; inbuf[0x08 / 4] = size;
inbuf[0x0C / 4] = cnt; inbuf[0x0C / 4] = cnt;
@ -191,44 +179,40 @@ int _FSA_ReadWriteFile(int fd, void* data, u32 size, u32 cnt, int fileHandle, u3
iovec[2].len = 0x293; iovec[2].len = 0x293;
int ret; int ret;
if(read) ret = svcIoctlv(fd, 0x0F, 1, 2, iovec); if (read) ret = svcIoctlv(fd, 0x0F, 1, 2, iovec);
else ret = svcIoctlv(fd, 0x10, 2, 1, iovec); else ret = svcIoctlv(fd, 0x10, 2, 1, iovec);
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
int FSA_ReadFile(int fd, void* data, u32 size, u32 cnt, int fileHandle, u32 flags) int FSA_ReadFile(int fd, void *data, u32 size, u32 cnt, int fileHandle, u32 flags) {
{
return _FSA_ReadWriteFile(fd, data, size, cnt, fileHandle, flags, true); return _FSA_ReadWriteFile(fd, data, size, cnt, fileHandle, flags, true);
} }
int FSA_WriteFile(int fd, void* data, u32 size, u32 cnt, int fileHandle, u32 flags) int FSA_WriteFile(int fd, void *data, u32 size, u32 cnt, int fileHandle, u32 flags) {
{
return _FSA_ReadWriteFile(fd, data, size, cnt, fileHandle, flags, false); return _FSA_ReadWriteFile(fd, data, size, cnt, fileHandle, flags, false);
} }
int FSA_StatFile(int fd, int handle, fileStat_s* out_data) int FSA_StatFile(int fd, int handle, fileStat_s *out_data) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = handle; inbuf[1] = handle;
int ret = svcIoctl(fd, 0x14, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x14, inbuf, 0x520, outbuf, 0x293);
if(out_data) memcpy(out_data, &outbuf[1], sizeof(fileStat_s)); if (out_data) memcpy(out_data, &outbuf[1], sizeof(fileStat_s));
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
int FSA_CloseFile(int fd, int fileHandle) int FSA_CloseFile(int fd, int fileHandle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = fileHandle; inbuf[1] = fileHandle;
@ -238,11 +222,10 @@ int FSA_CloseFile(int fd, int fileHandle)
return ret; return ret;
} }
int FSA_SetPosFile(int fd, int fileHandle, u32 position) int FSA_SetPosFile(int fd, int fileHandle, u32 position) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = fileHandle; inbuf[1] = fileHandle;
inbuf[2] = position; inbuf[2] = position;
@ -253,30 +236,28 @@ int FSA_SetPosFile(int fd, int fileHandle, u32 position)
return ret; return ret;
} }
int FSA_GetStat(int fd, char *path, fileStat_s* out_data) int FSA_GetStat(int fd, char *path, fileStat_s *out_data) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
inbuf[0x284/4] = 5; inbuf[0x284 / 4] = 5;
int ret = svcIoctl(fd, 0x18, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x18, inbuf, 0x520, outbuf, 0x293);
if(out_data) memcpy(out_data, &outbuf[1], sizeof(fileStat_s)); if (out_data) memcpy(out_data, &outbuf[1], sizeof(fileStat_s));
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
int FSA_Remove(int fd, char *path) int FSA_Remove(int fd, char *path) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
int ret = svcIoctl(fd, 0x08, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x08, inbuf, 0x520, outbuf, 0x293);
@ -284,15 +265,14 @@ int FSA_Remove(int fd, char *path)
return ret; return ret;
} }
int FSA_ChangeMode(int fd, char *path, int mode) int FSA_ChangeMode(int fd, char *path, int mode) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], path, 0x27F); strncpy((char *) &inbuf[0x01], path, 0x27F);
inbuf[0x284/4] = mode; inbuf[0x284 / 4] = mode;
inbuf[0x288/4] = 0x777; // mask inbuf[0x288 / 4] = 0x777; // mask
int ret = svcIoctl(fd, 0x20, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x20, inbuf, 0x520, outbuf, 0x293);
@ -303,22 +283,22 @@ int FSA_ChangeMode(int fd, char *path, int mode)
// type 4 : // type 4 :
// 0x08 : device size in sectors (u64) // 0x08 : device size in sectors (u64)
// 0x10 : device sector size (u32) // 0x10 : device sector size (u32)
int FSA_GetDeviceInfo(int fd, char* device_path, int type, u32* out_data) int FSA_GetDeviceInfo(int fd, char *device_path, int type, u32 *out_data) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], device_path, 0x27F); strncpy((char *) &inbuf[0x01], device_path, 0x27F);
inbuf[0x284 / 4] = type; inbuf[0x284 / 4] = type;
int ret = svcIoctl(fd, 0x18, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x18, inbuf, 0x520, outbuf, 0x293);
int size = 0; int size = 0;
switch(type) switch (type) {
{ case 0:
case 0: case 1: case 7: case 1:
case 7:
size = 0x8; size = 0x8;
break; break;
case 2: case 2:
@ -333,7 +313,8 @@ int FSA_GetDeviceInfo(int fd, char* device_path, int type, u32* out_data)
case 5: case 5:
size = 0x64; size = 0x64;
break; break;
case 6: case 8: case 6:
case 8:
size = 0x14; size = 0x14;
break; break;
} }
@ -344,27 +325,25 @@ int FSA_GetDeviceInfo(int fd, char* device_path, int type, u32* out_data)
return ret; return ret;
} }
int FSA_RawOpen(int fd, char* device_path, int* outHandle) int FSA_RawOpen(int fd, char *device_path, int *outHandle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
strncpy((char*)&inbuf[0x01], device_path, 0x27F); strncpy((char *) &inbuf[0x01], device_path, 0x27F);
int ret = svcIoctl(fd, 0x6A, inbuf, 0x520, outbuf, 0x293); int ret = svcIoctl(fd, 0x6A, inbuf, 0x520, outbuf, 0x293);
if(outHandle) *outHandle = outbuf[1]; if (outHandle) *outHandle = outbuf[1];
freeIobuf(iobuf); freeIobuf(iobuf);
return ret; return ret;
} }
int FSA_RawClose(int fd, int device_handle) int FSA_RawClose(int fd, int device_handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) &iobuf[0x520];
u32* outbuf = (u32*)&iobuf[0x520];
inbuf[1] = device_handle; inbuf[1] = device_handle;
@ -375,14 +354,13 @@ int FSA_RawClose(int fd, int device_handle)
} }
// offset in blocks of 0x1000 bytes // offset in blocks of 0x1000 bytes
int FSA_RawRead(int fd, void* data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) int FSA_RawRead(int fd, void *data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u8 *inbuf8 = iobuf;
u8* inbuf8 = iobuf; u8 *outbuf8 = &iobuf[0x520];
u8* outbuf8 = &iobuf[0x520]; iovec_s *iovec = (iovec_s *) &iobuf[0x7C0];
iovec_s* iovec = (iovec_s*)&iobuf[0x7C0]; u32 *inbuf = (u32 *) inbuf8;
u32* inbuf = (u32*)inbuf8; u32 *outbuf = (u32 *) outbuf8;
u32* outbuf = (u32*)outbuf8;
// note : offset_bytes = blocks_offset * size_bytes // note : offset_bytes = blocks_offset * size_bytes
inbuf[0x08 / 4] = (blocks_offset >> 32); inbuf[0x08 / 4] = (blocks_offset >> 32);
@ -406,14 +384,13 @@ int FSA_RawRead(int fd, void* data, u32 size_bytes, u32 cnt, u64 blocks_offset,
return ret; return ret;
} }
int FSA_RawWrite(int fd, void* data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) int FSA_RawWrite(int fd, void *data, u32 size_bytes, u32 cnt, u64 blocks_offset, int device_handle) {
{ u8 *iobuf = allocIobuf();
u8* iobuf = allocIobuf(); u8 *inbuf8 = iobuf;
u8* inbuf8 = iobuf; u8 *outbuf8 = &iobuf[0x520];
u8* outbuf8 = &iobuf[0x520]; iovec_s *iovec = (iovec_s *) &iobuf[0x7C0];
iovec_s* iovec = (iovec_s*)&iobuf[0x7C0]; u32 *inbuf = (u32 *) inbuf8;
u32* inbuf = (u32*)inbuf8; u32 *outbuf = (u32 *) outbuf8;
u32* outbuf = (u32*)outbuf8;
inbuf[0x08 / 4] = (blocks_offset >> 32); inbuf[0x08 / 4] = (blocks_offset >> 32);
inbuf[0x0C / 4] = (blocks_offset & 0xFFFFFFFF); inbuf[0x0C / 4] = (blocks_offset & 0xFFFFFFFF);

59
source/ios_mcp/source/fsa.h
View File

@ -1,8 +1,7 @@
#ifndef FSA_H #ifndef FSA_H
#define FSA_H #define FSA_H
typedef struct typedef struct {
{
u32 flag; u32 flag;
u32 permission; u32 permission;
u32 owner_id; u32 owner_id;
@ -14,13 +13,12 @@ typedef struct
u32 ctime; u32 ctime;
u32 mtime; u32 mtime;
u32 unk2[0x0D]; u32 unk2[0x0D];
}fileStat_s; } fileStat_s;
typedef struct typedef struct {
{
fileStat_s stat; fileStat_s stat;
char name[0x100]; char name[0x100];
}directoryEntry_s; } directoryEntry_s;
#define DIR_ENTRY_IS_DIRECTORY 0x80000000 #define DIR_ENTRY_IS_DIRECTORY 0x80000000
@ -29,31 +27,48 @@ typedef struct
int FSA_Open(); int FSA_Open();
int FSA_Mount(int fd, char* device_path, char* volume_path, u32 flags, char* arg_string, int arg_string_len); int FSA_Mount(int fd, char *device_path, char *volume_path, u32 flags, char *arg_string, int arg_string_len);
int FSA_Unmount(int fd, char* path, u32 flags);
int FSA_GetDeviceInfo(int fd, char* device_path, int type, u32* out_data); int FSA_Unmount(int fd, char *path, u32 flags);
int FSA_GetDeviceInfo(int fd, char *device_path, int type, u32 *out_data);
int FSA_MakeDir(int fd, char *path, u32 flags);
int FSA_OpenDir(int fd, char *path, int *outHandle);
int FSA_ReadDir(int fd, int handle, directoryEntry_s *out_data);
int FSA_MakeDir(int fd, char* path, u32 flags);
int FSA_OpenDir(int fd, char* path, int* outHandle);
int FSA_ReadDir(int fd, int handle, directoryEntry_s* out_data);
int FSA_RewindDir(int fd, int handle); int FSA_RewindDir(int fd, int handle);
int FSA_CloseDir(int fd, int handle);
int FSA_ChangeDir(int fd, char* path);
int FSA_OpenFile(int fd, char* path, char* mode, int* outHandle); int FSA_CloseDir(int fd, int handle);
int FSA_ReadFile(int fd, void* data, u32 size, u32 cnt, int fileHandle, u32 flags);
int FSA_WriteFile(int fd, void* data, u32 size, u32 cnt, int fileHandle, u32 flags); int FSA_ChangeDir(int fd, char *path);
int FSA_StatFile(int fd, int handle, fileStat_s* out_data);
int FSA_OpenFile(int fd, char *path, char *mode, int *outHandle);
int FSA_ReadFile(int fd, void *data, u32 size, u32 cnt, int fileHandle, u32 flags);
int FSA_WriteFile(int fd, void *data, u32 size, u32 cnt, int fileHandle, u32 flags);
int FSA_StatFile(int fd, int handle, fileStat_s *out_data);
int FSA_CloseFile(int fd, int fileHandle); int FSA_CloseFile(int fd, int fileHandle);
int FSA_SetPosFile(int fd, int fileHandle, u32 position); int FSA_SetPosFile(int fd, int fileHandle, u32 position);
int FSA_GetStat(int fd, char *path, fileStat_s* out_data);
int FSA_GetStat(int fd, char *path, fileStat_s *out_data);
int FSA_Remove(int fd, char *path); int FSA_Remove(int fd, char *path);
int FSA_ChangeMode(int fd, char *path, int mode); int FSA_ChangeMode(int fd, char *path, int mode);
int FSA_RawOpen(int fd, char* device_path, int* outHandle); int FSA_RawOpen(int fd, char *device_path, int *outHandle);
int FSA_RawRead(int fd, void* data, u32 size_bytes, u32 cnt, u64 sector_offset, int device_handle);
int FSA_RawWrite(int fd, void* data, u32 size_bytes, u32 cnt, u64 sector_offset, int device_handle); int FSA_RawRead(int fd, void *data, u32 size_bytes, u32 cnt, u64 sector_offset, int device_handle);
int FSA_RawWrite(int fd, void *data, u32 size_bytes, u32 cnt, u64 sector_offset, int device_handle);
int FSA_RawClose(int fd, int device_handle); int FSA_RawClose(int fd, int device_handle);
#endif #endif

38
source/ios_mcp/source/imports.c
View File

@ -1,26 +1,26 @@
#include "imports.h" #include "imports.h"
void usleep(u32 time) { void usleep(u32 time) {
((void (*const)(u32))0x050564E4)(time); ((void (*const)(u32)) 0x050564E4)(time);
} }
void* memset(void* dst, int val, size_t size) { void *memset(void *dst, int val, size_t size) {
char* _dst = dst; char *_dst = dst;
int i; int i;
for(i = 0; i < size; i++) for (i = 0; i < size; i++)
_dst[i] = val; _dst[i] = val;
return dst; return dst;
} }
void* (*const _memcpy)(void* dst, void* src, int size) = (void*)0x05054E54; void *(*const _memcpy)(void *dst, void *src, int size) = (void *) 0x05054E54;
void* memcpy(void* dst, const void* src, size_t size) { void *memcpy(void *dst, const void *src, size_t size) {
return _memcpy(dst, (void*)src, size); return _memcpy(dst, (void *) src, size);
} }
int strlen(const char* str) { int strlen(const char *str) {
unsigned int i = 0; unsigned int i = 0;
while (str[i]) { while (str[i]) {
i++; i++;
@ -28,23 +28,23 @@ int strlen(const char* str) {
return i; return i;
} }
int strncmp( const char * s1, const char * s2, size_t n ) { int strncmp(const char *s1, const char *s2, size_t n) {
while ( n && *s1 && ( *s1 == *s2 ) ) { while (n && *s1 && (*s1 == *s2)) {
++s1; ++s1;
++s2; ++s2;
--n; --n;
} }
if ( n == 0 ) { if (n == 0) {
return 0; return 0;
} else { } else {
return ( *(unsigned char *)s1 - *(unsigned char *)s2 ); return (*(unsigned char *) s1 - *(unsigned char *) s2);
} }
} }
// Function to implement strncat() function in C // Function to implement strncat() function in C
char* strncat(char* destination, const char* source, size_t num) { char *strncat(char *destination, const char *source, size_t num) {
// make ptr point to the end of destination string // make ptr point to the end of destination string
char* ptr = destination + strlen(destination); char *ptr = destination + strlen(destination);
// Appends characters of source to the destination string // Appends characters of source to the destination string
while (*source != '\0' && num--) while (*source != '\0' && num--)
@ -57,17 +57,17 @@ char* strncat(char* destination, const char* source, size_t num) {
return destination; return destination;
} }
char* strncpy(char* dst, const char* src, size_t size) { char *strncpy(char *dst, const char *src, size_t size) {
int i; int i;
for(i = 0; i < size; i++) { for (i = 0; i < size; i++) {
dst[i] = src[i]; dst[i] = src[i];
if(src[i] == '\0') if (src[i] == '\0')
return dst; return dst;
} }
return dst; return dst;
} }
int vsnprintf(char * s, size_t n, const char * format, va_list arg) { int vsnprintf(char *s, size_t n, const char *format, va_list arg) {
return ((int (*const)(char*, size_t, const char *, va_list))0x05055C40)(s, n, format, arg); return ((int (*const)(char *, size_t, const char *, va_list)) 0x05055C40)(s, n, format, arg);
} }

269
source/ios_mcp/source/ipc.c
View File

@ -77,44 +77,30 @@
static int ipcNodeKilled; static int ipcNodeKilled;
static u8 threadStack[0x1000] __attribute__((aligned(0x20))); static u8 threadStack[0x1000] __attribute__((aligned(0x20)));
static int ipc_ioctl(ipcmessage *message) static int ipc_ioctl(ipcmessage *message) {
{
int res = 0; int res = 0;
switch(message->ioctl.command) switch (message->ioctl.command) {
{ case IOCTL_MEM_WRITE: {
case IOCTL_MEM_WRITE: if (message->ioctl.length_in < 4) {
{
if(message->ioctl.length_in < 4)
{
res = IOS_ERROR_INVALID_SIZE; res = IOS_ERROR_INVALID_SIZE;
} } else {
else memcpy((void *) message->ioctl.buffer_in[0], message->ioctl.buffer_in + 1, message->ioctl.length_in - 4);
{
memcpy((void*)message->ioctl.buffer_in[0], message->ioctl.buffer_in + 1, message->ioctl.length_in - 4);
} }
break; break;
} }
case IOCTL_MEM_READ: case IOCTL_MEM_READ: {
{ if (message->ioctl.length_in < 4) {
if(message->ioctl.length_in < 4)
{
res = IOS_ERROR_INVALID_SIZE; res = IOS_ERROR_INVALID_SIZE;
} } else {
else memcpy(message->ioctl.buffer_io, (void *) message->ioctl.buffer_in[0], message->ioctl.length_io);
{
memcpy(message->ioctl.buffer_io, (void*)message->ioctl.buffer_in[0], message->ioctl.length_io);
} }
break; break;
} }
case IOCTL_SVC: case IOCTL_SVC: {
{ if ((message->ioctl.length_in < 4) || (message->ioctl.length_io < 4)) {
if((message->ioctl.length_in < 4) || (message->ioctl.length_io < 4))
{
res = IOS_ERROR_INVALID_SIZE; res = IOS_ERROR_INVALID_SIZE;
} } else {
else
{
int svc_id = message->ioctl.buffer_in[0]; int svc_id = message->ioctl.buffer_in[0];
int size_arguments = message->ioctl.length_in - 4; int size_arguments = message->ioctl.length_in - 4;
@ -123,56 +109,44 @@ static int ipc_ioctl(ipcmessage *message)
memcpy(arguments, message->ioctl.buffer_in + 1, (size_arguments < 8 * 4) ? size_arguments : (8 * 4)); memcpy(arguments, message->ioctl.buffer_in + 1, (size_arguments < 8 * 4) ? size_arguments : (8 * 4));
// return error code as data // return error code as data
message->ioctl.buffer_io[0] = ((int (*const)(u32, u32, u32, u32, u32, u32, u32, u32))(MCP_SVC_BASE + svc_id * 8))(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7]); message->ioctl.buffer_io[0] = ((int (*const)(u32, u32, u32, u32, u32, u32, u32, u32)) (MCP_SVC_BASE + svc_id * 8))(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6],
arguments[7]);
} }
break; break;
} }
case IOCTL_KILL_SERVER: case IOCTL_KILL_SERVER: {
{
ipcNodeKilled = 1; ipcNodeKilled = 1;
wupserver_deinit(); wupserver_deinit();
break; break;
} }
case IOCTL_MEMCPY: case IOCTL_MEMCPY: {
{ if (message->ioctl.length_in < 12) {
if(message->ioctl.length_in < 12)
{
res = IOS_ERROR_INVALID_SIZE; res = IOS_ERROR_INVALID_SIZE;
} } else {
else memcpy((void *) message->ioctl.buffer_in[0], (void *) message->ioctl.buffer_in[1], message->ioctl.buffer_in[2]);
{
memcpy((void*)message->ioctl.buffer_in[0], (void*)message->ioctl.buffer_in[1], message->ioctl.buffer_in[2]);
} }
break; break;
} }
case IOCTL_REPEATED_WRITE: case IOCTL_REPEATED_WRITE: {
{ if (message->ioctl.length_in < 12) {
if(message->ioctl.length_in < 12)
{
res = IOS_ERROR_INVALID_SIZE; res = IOS_ERROR_INVALID_SIZE;
} } else {
else u32 *dst = (u32 *) message->ioctl.buffer_in[0];
{ u32 *cache_range = (u32 *) (message->ioctl.buffer_in[0] & ~0xFF);
u32* dst = (u32*)message->ioctl.buffer_in[0];
u32* cache_range = (u32*)(message->ioctl.buffer_in[0] & ~0xFF);
u32 value = message->ioctl.buffer_in[1]; u32 value = message->ioctl.buffer_in[1];
u32 n = message->ioctl.buffer_in[2]; u32 n = message->ioctl.buffer_in[2];
u32 old = *dst; u32 old = *dst;
int i; int i;
for(i = 0; i < n; i++) for (i = 0; i < n; i++) {
{ if (*dst != old) {
if(*dst != old) if (*dst == 0x0) old = *dst;
{ else {
if(*dst == 0x0) old = *dst;
else
{
*dst = value; *dst = value;
svcFlushDCache(cache_range, 0x100); svcFlushDCache(cache_range, 0x100);
break; break;
} }
}else } else {
{
svcInvalidateDCache(cache_range, 0x100); svcInvalidateDCache(cache_range, 0x100);
usleep(50); usleep(50);
} }
@ -180,23 +154,17 @@ static int ipc_ioctl(ipcmessage *message)
} }
break; break;
} }
case IOCTL_KERN_READ32: case IOCTL_KERN_READ32: {
{ if ((message->ioctl.length_in < 4) || (message->ioctl.length_io < 4)) {
if((message->ioctl.length_in < 4) || (message->ioctl.length_io < 4))
{
res = IOS_ERROR_INVALID_SIZE; res = IOS_ERROR_INVALID_SIZE;
} } else {
else for (u32 i = 0; i < (message->ioctl.length_io / 4); i++) {
{
for(u32 i = 0; i < (message->ioctl.length_io/4); i++)
{
message->ioctl.buffer_io[i] = svcCustomKernelCommand(KERNEL_READ32, message->ioctl.buffer_in[0] + i * 4); message->ioctl.buffer_io[i] = svcCustomKernelCommand(KERNEL_READ32, message->ioctl.buffer_in[0] + i * 4);
} }
} }
break; break;
} }
case IOCTL_KERN_WRITE32: case IOCTL_KERN_WRITE32: {
{
//! TODO: add syscall as on kern_read32 //! TODO: add syscall as on kern_read32
res = IOS_ERROR_NOEXISTS; res = IOS_ERROR_NOEXISTS;
break; break;
@ -205,129 +173,114 @@ static int ipc_ioctl(ipcmessage *message)
//! FSA handles for better performance //! FSA handles for better performance
//!-------------------------------------------------------------------------------------------------------------- //!--------------------------------------------------------------------------------------------------------------
//! TODO: add checks for i/o buffer length //! TODO: add checks for i/o buffer length
case IOCTL_FSA_OPEN: case IOCTL_FSA_OPEN: {
{
message->ioctl.buffer_io[0] = svcOpen("/dev/fsa", 0); message->ioctl.buffer_io[0] = svcOpen("/dev/fsa", 0);
break; break;
} }
case IOCTL_FSA_CLOSE: case IOCTL_FSA_CLOSE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
message->ioctl.buffer_io[0] = svcClose(fd); message->ioctl.buffer_io[0] = svcClose(fd);
break; break;
} }
case IOCTL_FSA_MOUNT: case IOCTL_FSA_MOUNT: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *device_path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *device_path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
char *volume_path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[2]; char *volume_path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[2];
u32 flags = message->ioctl.buffer_in[3]; u32 flags = message->ioctl.buffer_in[3];
char *arg_string = (message->ioctl.buffer_in[4] > 0) ? (((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[4]) : 0; char *arg_string = (message->ioctl.buffer_in[4] > 0) ? (((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[4]) : 0;
int arg_string_len = message->ioctl.buffer_in[5]; int arg_string_len = message->ioctl.buffer_in[5];
message->ioctl.buffer_io[0] = FSA_Mount(fd, device_path, volume_path, flags, arg_string, arg_string_len); message->ioctl.buffer_io[0] = FSA_Mount(fd, device_path, volume_path, flags, arg_string, arg_string_len);
break; break;
} }
case IOCTL_FSA_UNMOUNT: case IOCTL_FSA_UNMOUNT: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *device_path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *device_path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
u32 flags = message->ioctl.buffer_in[2]; u32 flags = message->ioctl.buffer_in[2];
message->ioctl.buffer_io[0] = FSA_Unmount(fd, device_path, flags); message->ioctl.buffer_io[0] = FSA_Unmount(fd, device_path, flags);
break; break;
} }
case IOCTL_FSA_GETDEVICEINFO: case IOCTL_FSA_GETDEVICEINFO: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *device_path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *device_path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
int type = message->ioctl.buffer_in[2]; int type = message->ioctl.buffer_in[2];
message->ioctl.buffer_io[0] = FSA_GetDeviceInfo(fd, device_path, type, message->ioctl.buffer_io + 1); message->ioctl.buffer_io[0] = FSA_GetDeviceInfo(fd, device_path, type, message->ioctl.buffer_io + 1);
break; break;
} }
case IOCTL_FSA_OPENDIR: case IOCTL_FSA_OPENDIR: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_OpenDir(fd, path, (int*)message->ioctl.buffer_io + 1); message->ioctl.buffer_io[0] = FSA_OpenDir(fd, path, (int *) message->ioctl.buffer_io + 1);
break; break;
} }
case IOCTL_FSA_READDIR: case IOCTL_FSA_READDIR: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
int handle = message->ioctl.buffer_in[1]; int handle = message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_ReadDir(fd, handle, (directoryEntry_s*)(message->ioctl.buffer_io + 1)); message->ioctl.buffer_io[0] = FSA_ReadDir(fd, handle, (directoryEntry_s *) (message->ioctl.buffer_io + 1));
break; break;
} }
case IOCTL_FSA_CLOSEDIR: case IOCTL_FSA_CLOSEDIR: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
int handle = message->ioctl.buffer_in[1]; int handle = message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_CloseDir(fd, handle); message->ioctl.buffer_io[0] = FSA_CloseDir(fd, handle);
break; break;
} }
case IOCTL_FSA_MAKEDIR: case IOCTL_FSA_MAKEDIR: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
u32 flags = message->ioctl.buffer_in[2]; u32 flags = message->ioctl.buffer_in[2];
message->ioctl.buffer_io[0] = FSA_MakeDir(fd, path, flags); message->ioctl.buffer_io[0] = FSA_MakeDir(fd, path, flags);
break; break;
} }
case IOCTL_FSA_OPENFILE: case IOCTL_FSA_OPENFILE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
char *mode = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[2]; char *mode = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[2];
message->ioctl.buffer_io[0] = FSA_OpenFile(fd, path, mode, (int*)message->ioctl.buffer_io + 1); message->ioctl.buffer_io[0] = FSA_OpenFile(fd, path, mode, (int *) message->ioctl.buffer_io + 1);
break; break;
} }
case IOCTL_FSA_READFILE: case IOCTL_FSA_READFILE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
u32 size = message->ioctl.buffer_in[1]; u32 size = message->ioctl.buffer_in[1];
u32 cnt = message->ioctl.buffer_in[2]; u32 cnt = message->ioctl.buffer_in[2];
int fileHandle = message->ioctl.buffer_in[3]; int fileHandle = message->ioctl.buffer_in[3];
u32 flags = message->ioctl.buffer_in[4]; u32 flags = message->ioctl.buffer_in[4];
message->ioctl.buffer_io[0] = FSA_ReadFile(fd, ((u8*)message->ioctl.buffer_io) + 0x40, size, cnt, fileHandle, flags); message->ioctl.buffer_io[0] = FSA_ReadFile(fd, ((u8 *) message->ioctl.buffer_io) + 0x40, size, cnt, fileHandle, flags);
break; break;
} }
case IOCTL_FSA_WRITEFILE: case IOCTL_FSA_WRITEFILE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
u32 size = message->ioctl.buffer_in[1]; u32 size = message->ioctl.buffer_in[1];
u32 cnt = message->ioctl.buffer_in[2]; u32 cnt = message->ioctl.buffer_in[2];
int fileHandle = message->ioctl.buffer_in[3]; int fileHandle = message->ioctl.buffer_in[3];
u32 flags = message->ioctl.buffer_in[4]; u32 flags = message->ioctl.buffer_in[4];
message->ioctl.buffer_io[0] = FSA_WriteFile(fd, ((u8*)message->ioctl.buffer_in) + 0x40, size, cnt, fileHandle, flags); message->ioctl.buffer_io[0] = FSA_WriteFile(fd, ((u8 *) message->ioctl.buffer_in) + 0x40, size, cnt, fileHandle, flags);
break; break;
} }
case IOCTL_FSA_STATFILE: case IOCTL_FSA_STATFILE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
int fileHandle = message->ioctl.buffer_in[1]; int fileHandle = message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_StatFile(fd, fileHandle, (fileStat_s*)(message->ioctl.buffer_io + 1)); message->ioctl.buffer_io[0] = FSA_StatFile(fd, fileHandle, (fileStat_s *) (message->ioctl.buffer_io + 1));
break; break;
} }
case IOCTL_FSA_CLOSEFILE: case IOCTL_FSA_CLOSEFILE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
int fileHandle = message->ioctl.buffer_in[1]; int fileHandle = message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_CloseFile(fd, fileHandle); message->ioctl.buffer_io[0] = FSA_CloseFile(fd, fileHandle);
break; break;
} }
case IOCTL_FSA_SETFILEPOS: case IOCTL_FSA_SETFILEPOS: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
int fileHandle = message->ioctl.buffer_in[1]; int fileHandle = message->ioctl.buffer_in[1];
u32 position = message->ioctl.buffer_in[2]; u32 position = message->ioctl.buffer_in[2];
@ -335,80 +288,71 @@ static int ipc_ioctl(ipcmessage *message)
message->ioctl.buffer_io[0] = FSA_SetPosFile(fd, fileHandle, position); message->ioctl.buffer_io[0] = FSA_SetPosFile(fd, fileHandle, position);
break; break;
} }
case IOCTL_FSA_GETSTAT: case IOCTL_FSA_GETSTAT: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_GetStat(fd, path, (fileStat_s*)(message->ioctl.buffer_io + 1)); message->ioctl.buffer_io[0] = FSA_GetStat(fd, path, (fileStat_s *) (message->ioctl.buffer_io + 1));
break; break;
} }
case IOCTL_FSA_REMOVE: case IOCTL_FSA_REMOVE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_Remove(fd, path); message->ioctl.buffer_io[0] = FSA_Remove(fd, path);
break; break;
} }
case IOCTL_FSA_REWINDDIR: case IOCTL_FSA_REWINDDIR: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
int dirFd = message->ioctl.buffer_in[1]; int dirFd = message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_RewindDir(fd, dirFd); message->ioctl.buffer_io[0] = FSA_RewindDir(fd, dirFd);
break; break;
} }
case IOCTL_FSA_CHDIR: case IOCTL_FSA_CHDIR: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_ChangeDir(fd, path); message->ioctl.buffer_io[0] = FSA_ChangeDir(fd, path);
break; break;
} }
case IOCTL_FSA_RAW_OPEN: case IOCTL_FSA_RAW_OPEN: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_RawOpen(fd, path, (int*)(message->ioctl.buffer_io + 1)); message->ioctl.buffer_io[0] = FSA_RawOpen(fd, path, (int *) (message->ioctl.buffer_io + 1));
break; break;
} }
case IOCTL_FSA_RAW_READ: case IOCTL_FSA_RAW_READ: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
u32 block_size = message->ioctl.buffer_in[1]; u32 block_size = message->ioctl.buffer_in[1];
u32 cnt = message->ioctl.buffer_in[2]; u32 cnt = message->ioctl.buffer_in[2];
u64 sector_offset = ((u64)message->ioctl.buffer_in[3] << 32ULL) | message->ioctl.buffer_in[4]; u64 sector_offset = ((u64) message->ioctl.buffer_in[3] << 32ULL) | message->ioctl.buffer_in[4];
int deviceHandle = message->ioctl.buffer_in[5]; int deviceHandle = message->ioctl.buffer_in[5];
message->ioctl.buffer_io[0] = FSA_RawRead(fd, ((u8*)message->ioctl.buffer_io) + 0x40, block_size, cnt, sector_offset, deviceHandle); message->ioctl.buffer_io[0] = FSA_RawRead(fd, ((u8 *) message->ioctl.buffer_io) + 0x40, block_size, cnt, sector_offset, deviceHandle);
break; break;
} }
case IOCTL_FSA_RAW_WRITE: case IOCTL_FSA_RAW_WRITE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
u32 block_size = message->ioctl.buffer_in[1]; u32 block_size = message->ioctl.buffer_in[1];
u32 cnt = message->ioctl.buffer_in[2]; u32 cnt = message->ioctl.buffer_in[2];
u64 sector_offset = ((u64)message->ioctl.buffer_in[3] << 32ULL) | message->ioctl.buffer_in[4]; u64 sector_offset = ((u64) message->ioctl.buffer_in[3] << 32ULL) | message->ioctl.buffer_in[4];
int deviceHandle = message->ioctl.buffer_in[5]; int deviceHandle = message->ioctl.buffer_in[5];
message->ioctl.buffer_io[0] = FSA_RawWrite(fd, ((u8*)message->ioctl.buffer_in) + 0x40, block_size, cnt, sector_offset, deviceHandle); message->ioctl.buffer_io[0] = FSA_RawWrite(fd, ((u8 *) message->ioctl.buffer_in) + 0x40, block_size, cnt, sector_offset, deviceHandle);
break; break;
} }
case IOCTL_FSA_RAW_CLOSE: case IOCTL_FSA_RAW_CLOSE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
int deviceHandle = message->ioctl.buffer_in[1]; int deviceHandle = message->ioctl.buffer_in[1];
message->ioctl.buffer_io[0] = FSA_RawClose(fd, deviceHandle); message->ioctl.buffer_io[0] = FSA_RawClose(fd, deviceHandle);
break; break;
} }
case IOCTL_FSA_CHANGEMODE: case IOCTL_FSA_CHANGEMODE: {
{
int fd = message->ioctl.buffer_in[0]; int fd = message->ioctl.buffer_in[0];
char *path = ((char *)message->ioctl.buffer_in) + message->ioctl.buffer_in[1]; char *path = ((char *) message->ioctl.buffer_in) + message->ioctl.buffer_in[1];
int mode = message->ioctl.buffer_in[2]; int mode = message->ioctl.buffer_in[2];
message->ioctl.buffer_io[0] = FSA_ChangeMode(fd, path, mode); message->ioctl.buffer_io[0] = FSA_ChangeMode(fd, path, mode);
@ -422,53 +366,43 @@ static int ipc_ioctl(ipcmessage *message)
return res; return res;
} }
static int ipc_thread(void *arg) static int ipc_thread(void *arg) {
{
int res; int res;
ipcmessage *message; ipcmessage *message;
u32 messageQueue[0x10]; u32 messageQueue[0x10];
int queueId = svcCreateMessageQueue(messageQueue, sizeof(messageQueue) / 4); int queueId = svcCreateMessageQueue(messageQueue, sizeof(messageQueue) / 4);
if(svcRegisterResourceManager("/dev/iosuhax", queueId) == 0) if (svcRegisterResourceManager("/dev/iosuhax", queueId) == 0) {
{ while (!ipcNodeKilled) {
while(!ipcNodeKilled)
{
res = svcReceiveMessage(queueId, &message, 0); res = svcReceiveMessage(queueId, &message, 0);
if(res < 0) if (res < 0) {
{
usleep(10000); usleep(10000);
continue; continue;
} }
switch(message->command) switch (message->command) {
{ case IOS_OPEN: {
case IOS_OPEN:
{
log_printf("IOS_OPEN\n"); log_printf("IOS_OPEN\n");
res = 0; res = 0;
break; break;
} }
case IOS_CLOSE: case IOS_CLOSE: {
{
log_printf("IOS_CLOSE\n"); log_printf("IOS_CLOSE\n");
res = 0; res = 0;
break; break;
} }
case IOS_IOCTL: case IOS_IOCTL: {
{
log_printf("IOS_IOCTL\n"); log_printf("IOS_IOCTL\n");
res = ipc_ioctl(message); res = ipc_ioctl(message);
break; break;
} }
case IOS_IOCTLV: case IOS_IOCTLV: {
{
log_printf("IOS_IOCTLV\n"); log_printf("IOS_IOCTLV\n");
res = 0; res = 0;
break; break;
} }
default: default: {
{
log_printf("unexpected command 0x%X\n", message->command); log_printf("unexpected command 0x%X\n", message->command);
res = IOS_ERROR_UNKNOWN_VALUE; res = IOS_ERROR_UNKNOWN_VALUE;
break; break;
@ -483,20 +417,17 @@ static int ipc_thread(void *arg)
return 0; return 0;
} }
void ipc_init(void) void ipc_init(void) {
{
ipcNodeKilled = 0; ipcNodeKilled = 0;
int threadId = svcCreateThread(ipc_thread, 0, (u32*)(threadStack + sizeof(threadStack)), sizeof(threadStack), 0x78, 1); int threadId = svcCreateThread(ipc_thread, 0, (u32 *) (threadStack + sizeof(threadStack)), sizeof(threadStack), 0x78, 1);
if(threadId >= 0) if (threadId >= 0)
svcStartThread(threadId); svcStartThread(threadId);
} }
void ipc_deinit(void) void ipc_deinit(void) {
{
int fd = svcOpen("/dev/iosuhax", 0); int fd = svcOpen("/dev/iosuhax", 0);
if(fd >= 0) if (fd >= 0) {
{
int dummy = 0; int dummy = 0;
svcIoctl(fd, IOCTL_KILL_SERVER, &dummy, sizeof(dummy), &dummy, sizeof(dummy)); svcIoctl(fd, IOCTL_KILL_SERVER, &dummy, sizeof(dummy), &dummy, sizeof(dummy));
svcClose(fd); svcClose(fd);

1
source/ios_mcp/source/ipc.h
View File

@ -2,6 +2,7 @@
#define _IPC_H_ #define _IPC_H_
void ipc_init(); void ipc_init();
void ipc_deinit(); void ipc_deinit();
#endif #endif

21
source/ios_mcp/source/ipc_types.h
View File

@ -21,8 +21,7 @@
/* IPC message */ /* IPC message */
typedef struct ipcmessage typedef struct ipcmessage {
{
u32 command; u32 command;
u32 result; u32 result;
u32 fd; u32 fd;
@ -32,31 +31,26 @@ typedef struct ipcmessage
u64 client_gid; u64 client_gid;
u32 server_handle; u32 server_handle;
union union {
{
u32 args[5]; u32 args[5];
struct struct {
{
char *device; char *device;
u32 mode; u32 mode;
u32 resultfd; u32 resultfd;
} open; } open;
struct struct {
{
void *data; void *data;
u32 length; u32 length;
} read, write; } read, write;
struct struct {
{
s32 offset; s32 offset;
s32 origin; s32 origin;
} seek; } seek;
struct struct {
{
u32 command; u32 command;
u32 *buffer_in; u32 *buffer_in;
@ -64,8 +58,7 @@ typedef struct ipcmessage
u32 *buffer_io; u32 *buffer_io;
u32 length_io; u32 length_io;
} ioctl; } ioctl;
struct _ioctlv struct _ioctlv {
{
u32 command; u32 command;
u32 num_in; u32 num_in;

6
source/ios_mcp/source/main.c
View File

@ -9,10 +9,8 @@
static int threadsStarted = 0; static int threadsStarted = 0;
int _startMainThread(void) int _startMainThread(void) {
{ if (threadsStarted == 0) {
if(threadsStarted == 0)
{
threadsStarted = 1; threadsStarted = 1;
wupserver_init(); wupserver_init();

78
source/ios_mcp/source/mcp_loadfile.c
View File

@ -23,11 +23,13 @@
#include "svc.h" #include "svc.h"
#include <string.h> #include <string.h>
int (*const real_MCP_LoadFile)(ipcmessage* msg) = (void*)0x0501CAA8 + 1; //+1 for thumb int (*const real_MCP_LoadFile)(ipcmessage *msg) = (void *) 0x0501CAA8 + 1; //+1 for thumb
int (*const MCP_DoLoadFile)(const char* path, const char* path2, void* outputBuffer, uint32_t outLength, uint32_t pos, int* bytesRead, uint32_t unk) = (void*)0x05017248 + 1; int (*const MCP_DoLoadFile)(const char *path, const char *path2, void *outputBuffer, uint32_t outLength, uint32_t pos, int *bytesRead, uint32_t unk) = (void *) 0x05017248 + 1;
int (*const MCP_UnknownStuff)(const char* path, uint32_t pos, void* outputBuffer, uint32_t outLength, uint32_t outLength2, uint32_t unk) = (void*)0x05014CAC + 1;
int (*const MCP_UnknownStuff)(const char *path, uint32_t pos, void *outputBuffer, uint32_t outLength, uint32_t outLength2, uint32_t unk) = (void *) 0x05014CAC + 1;
static int MCP_LoadCustomFile(int target, char *path, int filesize, int fileoffset, void *out_buffer, int buffer_len, int pos);
static int MCP_LoadCustomFile(int target, char* path, int filesize, int fileoffset, void * out_buffer, int buffer_len, int pos);
static bool skipPPCSetup = false; static bool skipPPCSetup = false;
static bool didrpxfirstchunk = false; static bool didrpxfirstchunk = false;
static bool doWantReplaceRPX = false; static bool doWantReplaceRPX = false;
@ -44,14 +46,14 @@ static char rpxpath[256];
return -29; \ return -29; \
} }
int _MCP_LoadFile_patch(ipcmessage* msg) { int _MCP_LoadFile_patch(ipcmessage *msg) {
FAIL_ON(!msg->ioctl.buffer_in, 0); FAIL_ON(!msg->ioctl.buffer_in, 0);
FAIL_ON(msg->ioctl.length_in != 0x12D8, msg->ioctl.length_in); FAIL_ON(msg->ioctl.length_in != 0x12D8, msg->ioctl.length_in);
FAIL_ON(!msg->ioctl.buffer_io, 0); FAIL_ON(!msg->ioctl.buffer_io, 0);
FAIL_ON(!msg->ioctl.length_io, 0); FAIL_ON(!msg->ioctl.length_io, 0);
MCPLoadFileRequest* request = (MCPLoadFileRequest*)msg->ioctl.buffer_in; MCPLoadFileRequest *request = (MCPLoadFileRequest *) msg->ioctl.buffer_in;
//dumpHex(request, sizeof(MCPLoadFileRequest)); //dumpHex(request, sizeof(MCPLoadFileRequest));
//DEBUG_FUNCTION_LINE("msg->ioctl.buffer_io = %p, msg->ioctl.length_io = 0x%X\n", msg->ioctl.buffer_io, msg->ioctl.length_io); //DEBUG_FUNCTION_LINE("msg->ioctl.buffer_io = %p, msg->ioctl.length_io = 0x%X\n", msg->ioctl.buffer_io, msg->ioctl.length_io);
@ -60,13 +62,13 @@ int _MCP_LoadFile_patch(ipcmessage* msg) {
int replace_target = replace_target_device; int replace_target = replace_target_device;
int replace_filesize = rep_filesize; int replace_filesize = rep_filesize;
int replace_fileoffset = rep_fileoffset; int replace_fileoffset = rep_fileoffset;
char * replace_path = rpxpath; char *replace_path = rpxpath;
skipPPCSetup = true; skipPPCSetup = true;
if(strncmp(request->name, "men.rpx", strlen("men.rpx")) == 0) { if (strncmp(request->name, "men.rpx", strlen("men.rpx")) == 0) {
//replace_path = "wiiu/root.rpx"; //replace_path = "wiiu/root.rpx";
if(skipPPCSetup){ if (skipPPCSetup) {
replace_path = "wiiu/men.rpx"; replace_path = "wiiu/men.rpx";
} }
// At startup we want to hook into the Wii U Menu by replacing the men.rpx with a file from the SD Card // At startup we want to hook into the Wii U Menu by replacing the men.rpx with a file from the SD Card
@ -84,13 +86,13 @@ int _MCP_LoadFile_patch(ipcmessage* msg) {
// on error don't try it again. // on error don't try it again.
skipPPCSetup = true; skipPPCSetup = true;
} }
} else if(strncmp(request->name, "safe.rpx", strlen("safe.rpx")) == 0) { } else if (strncmp(request->name, "safe.rpx", strlen("safe.rpx")) == 0) {
if (request->pos == 0) { if (request->pos == 0) {
didrpxfirstchunk = false; didrpxfirstchunk = false;
} }
// if we don't explicitly replace files, we do want replace the Healt and Safety app with the HBL // if we don't explicitly replace files, we do want replace the Healt and Safety app with the HBL
if(!doWantReplaceRPX) { if (!doWantReplaceRPX) {
replace_path = "wiiu/apps/homebrew_launcher/homebrew_launcher.rpx"; replace_path = "wiiu/apps/homebrew_launcher/homebrew_launcher.rpx";
replace_target = LOAD_FILE_TARGET_SD_CARD; replace_target = LOAD_FILE_TARGET_SD_CARD;
//doWantReplaceXML = false; //doWantReplaceXML = false;
@ -100,7 +102,7 @@ int _MCP_LoadFile_patch(ipcmessage* msg) {
} }
} }
if(replace_path != NULL && strlen(replace_path) > 0) { if (replace_path != NULL && strlen(replace_path) > 0) {
if (!didrpxfirstchunk || request->pos > 0) { if (!didrpxfirstchunk || request->pos > 0) {
doWantReplaceRPX = false; // Only replace it once. doWantReplaceRPX = false; // Only replace it once.
int result = MCP_LoadCustomFile(replace_target, replace_path, replace_filesize, replace_fileoffset, msg->ioctl.buffer_io, msg->ioctl.length_io, request->pos); int result = MCP_LoadCustomFile(replace_target, replace_path, replace_filesize, replace_fileoffset, msg->ioctl.buffer_io, msg->ioctl.length_io, request->pos);
@ -121,30 +123,30 @@ int _MCP_LoadFile_patch(ipcmessage* msg) {
// Set filesize to 0 if unknown. // Set filesize to 0 if unknown.
static int MCP_LoadCustomFile(int target, char* path, int filesize, int fileoffset, void * buffer_out, int buffer_len, int pos) { static int MCP_LoadCustomFile(int target, char *path, int filesize, int fileoffset, void *buffer_out, int buffer_len, int pos) {
if(path == NULL) { if (path == NULL) {
return 0; return 0;
} }
char filepath[256]; char filepath[256];
memset(filepath,0,sizeof(filepath)); memset(filepath, 0, sizeof(filepath));
strncpy(filepath, path, sizeof(filepath) -1); strncpy(filepath, path, sizeof(filepath) - 1);
if(target == LOAD_FILE_TARGET_SD_CARD) { if (target == LOAD_FILE_TARGET_SD_CARD) {
char mountpath[] = "/vol/storage_iosu_homebrew"; char mountpath[] = "/vol/storage_iosu_homebrew";
int fsa_h = svcOpen("/dev/fsa", 0); int fsa_h = svcOpen("/dev/fsa", 0);
FSA_Mount(fsa_h, "/dev/sdcard01", mountpath, 2, NULL, 0); FSA_Mount(fsa_h, "/dev/sdcard01", mountpath, 2, NULL, 0);
svcClose(fsa_h); svcClose(fsa_h);
strncpy(filepath,mountpath,sizeof(filepath) -1); strncpy(filepath, mountpath, sizeof(filepath) - 1);
strncat(filepath,"/",(sizeof(filepath) - 1) - strlen(filepath)); strncat(filepath, "/", (sizeof(filepath) - 1) - strlen(filepath));
strncat(filepath,path,(sizeof(filepath) - 1) - strlen(filepath)); strncat(filepath, path, (sizeof(filepath) - 1) - strlen(filepath));
} }
DEBUG_FUNCTION_LINE("Load custom path \"%s\"\n", filepath); DEBUG_FUNCTION_LINE("Load custom path \"%s\"\n", filepath);
if(filesize > 0 && (pos + fileoffset > filesize)) { if (filesize > 0 && (pos + fileoffset > filesize)) {
return 0; return 0;
} }
@ -164,7 +166,7 @@ static int MCP_LoadCustomFile(int target, char* path, int filesize, int fileoffs
//log("MCP_UnknownStuff returned %d\n", result); //log("MCP_UnknownStuff returned %d\n", result);
if (result >= 0) { if (result >= 0) {
if(filesize > 0 && (bytesRead + pos > filesize)) { if (filesize > 0 && (bytesRead + pos > filesize)) {
return filesize - pos; return filesize - pos;
} }
return bytesRead; return bytesRead;
@ -176,25 +178,25 @@ static int MCP_LoadCustomFile(int target, char* path, int filesize, int fileoffs
/* RPX replacement! Call this ioctl to replace the next loaded RPX with an arbitrary path. /* RPX replacement! Call this ioctl to replace the next loaded RPX with an arbitrary path.
DO NOT RETURN 0, this affects the codepaths back in the IOSU code */ DO NOT RETURN 0, this affects the codepaths back in the IOSU code */
int _MCP_ioctl100_patch(ipcmessage* msg) { int _MCP_ioctl100_patch(ipcmessage *msg) {
/* Give some method to detect this ioctl's prescence, even if the other args are bad */ /* Give some method to detect this ioctl's prescence, even if the other args are bad */
if (msg->ioctl.buffer_io && msg->ioctl.length_io >= sizeof(u32)) { if (msg->ioctl.buffer_io && msg->ioctl.length_io >= sizeof(u32)) {
*(u32*)msg->ioctl.buffer_io = 1; *(u32 *) msg->ioctl.buffer_io = 1;
} }
FAIL_ON(!msg->ioctl.buffer_in, 0); FAIL_ON(!msg->ioctl.buffer_in, 0);
FAIL_ON(!msg->ioctl.length_in, 0); FAIL_ON(!msg->ioctl.length_in, 0);
if(msg->ioctl.buffer_in && msg->ioctl.length_in >= 4) { if (msg->ioctl.buffer_in && msg->ioctl.length_in >= 4) {
int command = msg->ioctl.buffer_in[0]; int command = msg->ioctl.buffer_in[0];
switch(command) { switch (command) {
case IPC_CUSTOM_LOG_STRING: { case IPC_CUSTOM_LOG_STRING: {
//DEBUG_FUNCTION_LINE("IPC_CUSTOM_LOG_STRING\n"); //DEBUG_FUNCTION_LINE("IPC_CUSTOM_LOG_STRING\n");
if(msg->ioctl.length_in > 4) { if (msg->ioctl.length_in > 4) {
char * str_ptr = (char * ) &msg->ioctl.buffer_in[0x04 / 0x04]; char *str_ptr = (char *) &msg->ioctl.buffer_in[0x04 / 0x04];
str_ptr[msg->ioctl.length_in - 0x04 - 1] = 0; str_ptr[msg->ioctl.length_in - 0x04 - 1] = 0;
log_printf("%s",str_ptr); log_printf("%s", str_ptr);
} }
return 1; return 1;
} }
@ -221,9 +223,9 @@ int _MCP_ioctl100_patch(ipcmessage* msg) {
return 1; return 1;
}*/ }*/
case IPC_CUSTOM_META_XML_READ: { case IPC_CUSTOM_META_XML_READ: {
if(msg->ioctl.length_io >= sizeof(ACPMetaXml)) { if (msg->ioctl.length_io >= sizeof(ACPMetaXml)) {
DEBUG_FUNCTION_LINE("IPC_CUSTOM_META_XML_READ\n"); DEBUG_FUNCTION_LINE("IPC_CUSTOM_META_XML_READ\n");
ACPMetaXml * app_ptr = (ACPMetaXml*) msg->ioctl.buffer_io; ACPMetaXml *app_ptr = (ACPMetaXml *) msg->ioctl.buffer_io;
strncpy(app_ptr->longname_en, rpxpath, 256 - 1); strncpy(app_ptr->longname_en, rpxpath, 256 - 1);
strncpy(app_ptr->shortname_en, rpxpath, 256 - 1); strncpy(app_ptr->shortname_en, rpxpath, 256 - 1);
} }
@ -232,12 +234,12 @@ int _MCP_ioctl100_patch(ipcmessage* msg) {
case IPC_CUSTOM_LOAD_CUSTOM_RPX: { case IPC_CUSTOM_LOAD_CUSTOM_RPX: {
DEBUG_FUNCTION_LINE("IPC_CUSTOM_LOAD_CUSTOM_RPX\n"); DEBUG_FUNCTION_LINE("IPC_CUSTOM_LOAD_CUSTOM_RPX\n");
if(msg->ioctl.length_in >= 0x110) { if (msg->ioctl.length_in >= 0x110) {
int target = msg->ioctl.buffer_in[0x04/0x04]; int target = msg->ioctl.buffer_in[0x04 / 0x04];
int filesize = msg->ioctl.buffer_in[0x08/0x04]; int filesize = msg->ioctl.buffer_in[0x08 / 0x04];
int fileoffset = msg->ioctl.buffer_in[0x0C/0x04]; int fileoffset = msg->ioctl.buffer_in[0x0C / 0x04];
char * str_ptr = (char * ) &msg->ioctl.buffer_in[0x10 / 0x04]; char *str_ptr = (char *) &msg->ioctl.buffer_in[0x10 / 0x04];
memset(rpxpath,0,sizeof(rpxpath)); memset(rpxpath, 0, sizeof(rpxpath));
strncpy(rpxpath, str_ptr, 256 - 1); strncpy(rpxpath, str_ptr, 256 - 1);
@ -247,7 +249,7 @@ int _MCP_ioctl100_patch(ipcmessage* msg) {
doWantReplaceRPX = true; doWantReplaceRPX = true;
//doWantReplaceXML = true; //doWantReplaceXML = true;
DEBUG_FUNCTION_LINE("Will load %s for next title from target: %d (offset %d, filesize %d)\n", rpxpath, target,rep_fileoffset,rep_filesize); DEBUG_FUNCTION_LINE("Will load %s for next title from target: %d (offset %d, filesize %d)\n", rpxpath, target, rep_fileoffset, rep_filesize);
} }
return 1; return 1;
} }

34
source/ios_mcp/source/net_ifmgr_ncl.c
View File

@ -6,14 +6,12 @@
static int ifmgrncl_handle = 0; static int ifmgrncl_handle = 0;
int ifmgrnclInit() int ifmgrnclInit() {
{ if (ifmgrncl_handle) return ifmgrncl_handle;
if(ifmgrncl_handle) return ifmgrncl_handle;
int ret = svcOpen("/dev/net/ifmgr/ncl", 0); int ret = svcOpen("/dev/net/ifmgr/ncl", 0);
if(ret > 0) if (ret > 0) {
{
ifmgrncl_handle = ret; ifmgrncl_handle = ret;
return ifmgrncl_handle; return ifmgrncl_handle;
} }
@ -21,8 +19,7 @@ int ifmgrnclInit()
return ret; return ret;
} }
int ifmgrnclExit() int ifmgrnclExit() {
{
int ret = svcClose(ifmgrncl_handle); int ret = svcClose(ifmgrncl_handle);
ifmgrncl_handle = 0; ifmgrncl_handle = 0;
@ -30,32 +27,29 @@ int ifmgrnclExit()
return ret; return ret;
} }
static void* allocIobuf(u32 size) static void *allocIobuf(u32 size) {
{ void *ptr = svcAlloc(0xCAFF, size);
void* ptr = svcAlloc(0xCAFF, size);
if(ptr) memset(ptr, 0x00, size); if (ptr) memset(ptr, 0x00, size);
return ptr; return ptr;
} }
static void freeIobuf(void* ptr) static void freeIobuf(void *ptr) {
{
svcFree(0xCAFF, ptr); svcFree(0xCAFF, ptr);
} }
int IFMGRNCL_GetInterfaceStatus(u16 interface_id, u16* out_status) int IFMGRNCL_GetInterfaceStatus(u16 interface_id, u16 *out_status) {
{ u8 *iobuf1 = allocIobuf(0x2);
u8* iobuf1 = allocIobuf(0x2); u16 *inbuf = (u16 *) iobuf1;
u16* inbuf = (u16*)iobuf1; u8 *iobuf2 = allocIobuf(0x8);
u8* iobuf2 = allocIobuf(0x8); u16 *outbuf = (u16 *) iobuf2;
u16* outbuf = (u16*)iobuf2;
inbuf[0] = interface_id; inbuf[0] = interface_id;
int ret = svcIoctl(ifmgrncl_handle, 0x14, inbuf, 0x2, outbuf, 0x8); int ret = svcIoctl(ifmgrncl_handle, 0x14, inbuf, 0x2, outbuf, 0x8);
if(!ret && out_status) *out_status = outbuf[2]; if (!ret && out_status) *out_status = outbuf[2];
freeIobuf(iobuf1); freeIobuf(iobuf1);
freeIobuf(iobuf2); freeIobuf(iobuf2);

3
source/ios_mcp/source/net_ifmgr_ncl.h
View File

@ -4,8 +4,9 @@
#include "types.h" #include "types.h"
int ifmgrnclInit(); int ifmgrnclInit();
int ifmgrnclExit(); int ifmgrnclExit();
int IFMGRNCL_GetInterfaceStatus(u16 interface_id, u16* out_status); int IFMGRNCL_GetInterfaceStatus(u16 interface_id, u16 *out_status);
#endif #endif

121
source/ios_mcp/source/socket.c
View File

@ -8,14 +8,12 @@
static int socket_handle = 0; static int socket_handle = 0;
int socketInit() int socketInit() {
{ if (socket_handle) return socket_handle;
if(socket_handle) return socket_handle;
int ret = svcOpen("/dev/socket", 0); int ret = svcOpen("/dev/socket", 0);
if(ret > 0) if (ret > 0) {
{
socket_handle = ret; socket_handle = ret;
return socket_handle; return socket_handle;
} }
@ -23,8 +21,7 @@ int socketInit()
return ret; return ret;
} }
int socketExit() int socketExit() {
{
int ret = svcClose(socket_handle); int ret = svcClose(socket_handle);
socket_handle = 0; socket_handle = 0;
@ -32,24 +29,21 @@ int socketExit()
return ret; return ret;
} }
static void* allocIobuf(u32 size) static void *allocIobuf(u32 size) {
{ void *ptr = svcAlloc(0xCAFF, size);
void* ptr = svcAlloc(0xCAFF, size);
if(ptr) memset(ptr, 0x00, size); if (ptr) memset(ptr, 0x00, size);
return ptr; return ptr;
} }
static void freeIobuf(void* ptr) static void freeIobuf(void *ptr) {
{
svcFree(0xCAFF, ptr); svcFree(0xCAFF, ptr);
} }
int socket(int domain, int type, int protocol) int socket(int domain, int type, int protocol) {
{ u8 *iobuf = allocIobuf(0xC);
u8* iobuf = allocIobuf(0xC); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf;
inbuf[0] = domain; inbuf[0] = domain;
inbuf[1] = type; inbuf[1] = type;
@ -61,10 +55,9 @@ int socket(int domain, int type, int protocol)
return ret; return ret;
} }
int closesocket(int sockfd) int closesocket(int sockfd) {
{ u8 *iobuf = allocIobuf(0x4);
u8* iobuf = allocIobuf(0x4); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf;
inbuf[0] = sockfd; inbuf[0] = sockfd;
@ -74,28 +67,25 @@ int closesocket(int sockfd)
return ret; return ret;
} }
int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
{ u8 *iobuf = allocIobuf(0x18);
u8* iobuf = allocIobuf(0x18); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf; u32 *outbuf = (u32 *) inbuf;
u32* outbuf = (u32*)inbuf;
inbuf[0] = sockfd; inbuf[0] = sockfd;
int ret = -1; int ret = -1;
if(addr && addrlen && *addrlen == 0x10) if (addr && addrlen && *addrlen == 0x10) {
{
inbuf[5] = *addrlen; inbuf[5] = *addrlen;
ret = svcIoctl(socket_handle, 0x1, inbuf, 0x18, outbuf, 0x18); ret = svcIoctl(socket_handle, 0x1, inbuf, 0x18, outbuf, 0x18);
if(ret >= 0) if (ret >= 0) {
{
memcpy(addr, &outbuf[1], outbuf[5]); memcpy(addr, &outbuf[1], outbuf[5]);
*addrlen = outbuf[5]; *addrlen = outbuf[5];
} }
}else{ } else {
inbuf[5] = 0x10; inbuf[5] = 0x10;
ret = svcIoctl(socket_handle, 0x1, inbuf, 0x18, outbuf, 0x18); ret = svcIoctl(socket_handle, 0x1, inbuf, 0x18, outbuf, 0x18);
@ -105,12 +95,11 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
return ret; return ret;
} }
int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
{ if (addrlen != 0x10) return -1;
if(addrlen != 0x10) return -1;
u8* iobuf = allocIobuf(0x18); u8 *iobuf = allocIobuf(0x18);
u32* inbuf = (u32*)iobuf; u32 *inbuf = (u32 *) iobuf;
inbuf[0] = sockfd; inbuf[0] = sockfd;
memcpy(&inbuf[1], addr, addrlen); memcpy(&inbuf[1], addr, addrlen);
@ -122,12 +111,11 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
return ret; return ret;
} }
int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
{ if (addrlen != 0x10) return -1;
if(addrlen != 0x10) return -1;
u8* iobuf = allocIobuf(0x18); u8 *iobuf = allocIobuf(0x18);
u32* inbuf = (u32*)iobuf; u32 *inbuf = (u32 *) iobuf;
inbuf[0] = sockfd; inbuf[0] = sockfd;
memcpy(&inbuf[1], addr, addrlen); memcpy(&inbuf[1], addr, addrlen);
@ -139,10 +127,9 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
return ret; return ret;
} }
int listen(int sockfd, int backlog) int listen(int sockfd, int backlog) {
{ u8 *iobuf = allocIobuf(0x8);
u8* iobuf = allocIobuf(0x8); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf;
inbuf[0] = sockfd; inbuf[0] = sockfd;
inbuf[1] = backlog; inbuf[1] = backlog;
@ -153,10 +140,9 @@ int listen(int sockfd, int backlog)
return ret; return ret;
} }
int shutdown(int sockfd, int how) int shutdown(int sockfd, int how) {
{ u8 *iobuf = allocIobuf(0x8);
u8* iobuf = allocIobuf(0x8); u32 *inbuf = (u32 *) iobuf;
u32* inbuf = (u32*)iobuf;
inbuf[0] = sockfd; inbuf[0] = sockfd;
inbuf[1] = how; inbuf[1] = how;
@ -167,30 +153,28 @@ int shutdown(int sockfd, int how)
return ret; return ret;
} }
int recv(int sockfd, void *buf, size_t len, int flags) int recv(int sockfd, void *buf, size_t len, int flags) {
{ if (!len) return -101;
if(!len) return -101;
// TODO : size checks, split up data into multiple vectors if necessary // TODO : size checks, split up data into multiple vectors if necessary
void* data_buf = svcAllocAlign(0xCAFF, len, 0x40); void *data_buf = svcAllocAlign(0xCAFF, len, 0x40);
if(!data_buf) return -100; if (!data_buf) return -100;
u8* iobuf = allocIobuf(0x38); u8 *iobuf = allocIobuf(0x38);
iovec_s* iovec = (iovec_s*)iobuf; iovec_s *iovec = (iovec_s *) iobuf;
u32* inbuf = (u32*)&iobuf[0x30]; u32 *inbuf = (u32 *) &iobuf[0x30];
inbuf[0] = sockfd; inbuf[0] = sockfd;
inbuf[1] = flags; inbuf[1] = flags;
iovec[0].ptr = inbuf; iovec[0].ptr = inbuf;
iovec[0].len = 0x8; iovec[0].len = 0x8;
iovec[1].ptr = (void*)data_buf; iovec[1].ptr = (void *) data_buf;
iovec[1].len = len; iovec[1].len = len;
int ret = svcIoctlv(socket_handle, 0xC, 1, 3, iovec); int ret = svcIoctlv(socket_handle, 0xC, 1, 3, iovec);
if(ret > 0 && buf) if (ret > 0 && buf) {
{
memcpy(buf, data_buf, ret); memcpy(buf, data_buf, ret);
} }
@ -199,17 +183,16 @@ int recv(int sockfd, void *buf, size_t len, int flags)
return ret; return ret;
} }
int send(int sockfd, const void *buf, size_t len, int flags) int send(int sockfd, const void *buf, size_t len, int flags) {
{ if (!buf || !len) return -101;
if(!buf || !len) return -101;
// TODO : size checks, split up data into multiple vectors if necessary // TODO : size checks, split up data into multiple vectors if necessary
void* data_buf = svcAllocAlign(0xCAFF, len, 0x40); void *data_buf = svcAllocAlign(0xCAFF, len, 0x40);
if(!data_buf) return -100; if (!data_buf) return -100;
u8* iobuf = allocIobuf(0x38); u8 *iobuf = allocIobuf(0x38);
iovec_s* iovec = (iovec_s*)iobuf; iovec_s *iovec = (iovec_s *) iobuf;
u32* inbuf = (u32*)&iobuf[0x30]; u32 *inbuf = (u32 *) &iobuf[0x30];
memcpy(data_buf, buf, len); memcpy(data_buf, buf, len);
@ -218,7 +201,7 @@ int send(int sockfd, const void *buf, size_t len, int flags)
iovec[0].ptr = inbuf; iovec[0].ptr = inbuf;
iovec[0].len = 0x8; iovec[0].len = 0x8;
iovec[1].ptr = (void*)data_buf; iovec[1].ptr = (void *) data_buf;
iovec[1].len = len; iovec[1].len = len;
int ret = svcIoctlv(socket_handle, 0xE, 4, 0, iovec); int ret = svcIoctlv(socket_handle, 0xE, 4, 0, iovec);

25
source/ios_mcp/source/socket.h
View File

@ -76,14 +76,12 @@
typedef uint32_t socklen_t; typedef uint32_t socklen_t;
typedef uint16_t sa_family_t; typedef uint16_t sa_family_t;
struct sockaddr struct sockaddr {
{
sa_family_t sa_family; sa_family_t sa_family;
char sa_data[]; char sa_data[];
}; };
struct sockaddr_storage struct sockaddr_storage {
{
sa_family_t ss_family; sa_family_t ss_family;
char __ss_padding[14]; char __ss_padding[14];
}; };
@ -102,30 +100,45 @@ struct sockaddr_in {
unsigned char sin_zero[8]; unsigned char sin_zero[8];
}; };
struct linger struct linger {
{
int l_onoff; int l_onoff;
int l_linger; int l_linger;
}; };
int socketInit(); int socketInit();
int socketExit(); int socketExit();
int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen); int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen); int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
int closesocket(int sockfd); int closesocket(int sockfd);
int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen); int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen); int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen); int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
int getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen); int getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen);
int listen(int sockfd, int backlog); int listen(int sockfd, int backlog);
ssize_t recv(int sockfd, void *buf, size_t len, int flags); ssize_t recv(int sockfd, void *buf, size_t len, int flags);
ssize_t recvfrom(int sockfd, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen); ssize_t recvfrom(int sockfd, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen);
ssize_t send(int sockfd, const void *buf, size_t len, int flags); ssize_t send(int sockfd, const void *buf, size_t len, int flags);
ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen); ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen);
int setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen); int setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen);
int shutdown(int sockfd, int how); int shutdown(int sockfd, int how);
int socket(int domain, int type, int protocol); int socket(int domain, int type, int protocol);
int sockatmark(int sockfd); int sockatmark(int sockfd);
#endif #endif

46
source/ios_mcp/source/svc.h
View File

@ -3,30 +3,44 @@
#include "ipc_types.h" #include "ipc_types.h"
typedef struct typedef struct {
{ void *ptr;
void* ptr;
u32 len; u32 len;
u32 unk; u32 unk;
}iovec_s; } iovec_s;
void *svcAlloc(u32 heapid, u32 size);
void *svcAllocAlign(u32 heapid, u32 size, u32 align);
void svcFree(u32 heapid, void *ptr);
int svcOpen(char *name, int mode);
void* svcAlloc(u32 heapid, u32 size);
void* svcAllocAlign(u32 heapid, u32 size, u32 align);
void svcFree(u32 heapid, void* ptr);
int svcOpen(char* name, int mode);
int svcClose(int fd); int svcClose(int fd);
int svcIoctl(int fd, u32 request, void* input_buffer, u32 input_buffer_len, void* output_buffer, u32 output_buffer_len);
int svcIoctlv(int fd, u32 request, u32 vector_count_in, u32 vector_count_out, iovec_s* vector);
int svcInvalidateDCache(void* address, u32 size);
int svcFlushDCache(void* address, u32 size);
int svcCreateThread(int (*callback)(void* arg), void* arg, u32* stack_top, u32 stacksize, int priority, int detached); int svcIoctl(int fd, u32 request, void *input_buffer, u32 input_buffer_len, void *output_buffer, u32 output_buffer_len);
int svcIoctlv(int fd, u32 request, u32 vector_count_in, u32 vector_count_out, iovec_s *vector);
int svcInvalidateDCache(void *address, u32 size);
int svcFlushDCache(void *address, u32 size);
int svcCreateThread(int (*callback)(void *arg), void *arg, u32 *stack_top, u32 stacksize, int priority, int detached);
int svcStartThread(int threadId); int svcStartThread(int threadId);
int svcCreateMessageQueue(u32 *ptr, u32 n_msgs); int svcCreateMessageQueue(u32 *ptr, u32 n_msgs);
int svcDestroyMessageQueue(int queueid); int svcDestroyMessageQueue(int queueid);
int svcRegisterResourceManager(const char* device, int queueid);
int svcReceiveMessage(int queueid, ipcmessage ** ipc_buf, u32 flags); int svcRegisterResourceManager(const char *device, int queueid);
int svcResourceReply(ipcmessage * ipc_message, u32 result);
int svcReceiveMessage(int queueid, ipcmessage **ipc_buf, u32 flags);
int svcResourceReply(ipcmessage *ipc_message, u32 result);
int svcCustomKernelCommand(u32 command, ...); int svcCustomKernelCommand(u32 command, ...);
#endif #endif

62
source/ios_mcp/source/text.c
View File

@ -11,30 +11,25 @@
#define CHAR_SIZE_X (8) #define CHAR_SIZE_X (8)
#define CHAR_SIZE_Y (8) #define CHAR_SIZE_Y (8)
static const u8 *launch_image_tga = (const u8*)0x27000000; static const u8 *launch_image_tga = (const u8 *) 0x27000000;
u32* const framebuffer = (u32*)FRAMEBUFFER_ADDRESS; u32 *const framebuffer = (u32 *) FRAMEBUFFER_ADDRESS;
void drawSplashScreen(void) void drawSplashScreen(void) {
{
// check if it is an unmapped RGB tga // check if it is an unmapped RGB tga
if(*(u32*)launch_image_tga != 0x00000200) if (*(u32 *) launch_image_tga != 0x00000200)
return; return;
int i; int i;
for(i = 0; i < (896 * 504); i++) for (i = 0; i < (896 * 504); i++) {
{
u32 pixel; u32 pixel;
u32 pixelOffset = 0x12 + i * 2; u32 pixelOffset = 0x12 + i * 2;
// access only 4 byte aligned data as the file is in code section // access only 4 byte aligned data as the file is in code section
u32 dualPixel = *(u32*)(launch_image_tga + (pixelOffset & ~3)); u32 dualPixel = *(u32 *) (launch_image_tga + (pixelOffset & ~3));
if((pixelOffset & 3) == 0) if ((pixelOffset & 3) == 0) {
{
pixel = ((dualPixel >> 24) & 0xFF) | (((dualPixel >> 16) & 0xFF) << 8); pixel = ((dualPixel >> 24) & 0xFF) | (((dualPixel >> 16) & 0xFF) << 8);
} } else {
else
{
pixel = ((dualPixel >> 8) & 0xFF) | ((dualPixel & 0xFF) << 8); pixel = ((dualPixel >> 8) & 0xFF) | ((dualPixel & 0xFF) << 8);
} }
@ -42,28 +37,23 @@ void drawSplashScreen(void)
} }
} }
void clearScreen(u32 color) void clearScreen(u32 color) {
{
int i; int i;
for(i = 0; i < 896 * 504; i++) for (i = 0; i < 896 * 504; i++) {
{
framebuffer[i] = color; framebuffer[i] = color;
} }
} }
void drawCharacter(char c, int x, int y) void drawCharacter(char c, int x, int y) {
{ if (c < 32)return;
if(c < 32)return;
c -= 32; c -= 32;
u8* charData = (u8*)&font_bin[(CHAR_SIZE_X * CHAR_SIZE_Y * c) / 8]; u8 *charData = (u8 *) &font_bin[(CHAR_SIZE_X * CHAR_SIZE_Y * c) / 8];
u32* fb = &framebuffer[x + y * FRAMEBUFFER_STRIDE_WORDS]; u32 *fb = &framebuffer[x + y * FRAMEBUFFER_STRIDE_WORDS];
int i, j; int i, j;
for(i = 0; i < CHAR_SIZE_Y; i++) for (i = 0; i < CHAR_SIZE_Y; i++) {
{ u8 v = *(charData++);
u8 v= *(charData++); for (j = 0; j < CHAR_SIZE_X; j++) {
for(j = 0; j < CHAR_SIZE_X; j++) if (v & 1) *fb = 0x00000000;
{
if(v & 1) *fb = 0x00000000;
else *fb = 0xFFFFFFFF; else *fb = 0xFFFFFFFF;
v >>= 1; v >>= 1;
fb++; fb++;
@ -72,27 +62,23 @@ void drawCharacter(char c, int x, int y)
} }
} }
void drawString(char* str, int x, int y) void drawString(char *str, int x, int y) {
{ if (!str) return;
if(!str) return;
int k; int k;
int dx = 0, dy = 0; int dx = 0, dy = 0;
for(k = 0; str[k]; k++) for (k = 0; str[k]; k++) {
{ if (str[k] >= 32 && str[k] < 128) drawCharacter(str[k], x + dx, y + dy);
if(str[k] >= 32 && str[k] < 128) drawCharacter(str[k], x + dx, y + dy);
dx += 8; dx += 8;
if(str[k] == '\n') if (str[k] == '\n') {
{
dx = 0; dx = 0;
dy -= 8; dy -= 8;
} }
} }
} }
void print(int x, int y, const char *format, ...) void print(int x, int y, const char *format, ...) {
{
va_list args; va_list args;
va_start(args, format); va_start(args, format);

5
source/ios_mcp/source/text.h
View File

@ -4,8 +4,11 @@
#include "types.h" #include "types.h"
void drawSplashScreen(void); void drawSplashScreen(void);
void clearScreen(u32 color); void clearScreen(u32 color);
void drawString(char* str, int x, int y);
void drawString(char *str, int x, int y);
void print(int x, int y, const char *format, ...); void print(int x, int y, const char *format, ...);
#endif #endif

38
source/ios_mcp/source/types.h
View File

@ -1,29 +1,29 @@
#ifndef TYPES_H #ifndef TYPES_H
#define TYPES_H #define TYPES_H
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#define U64_MAX UINT64_MAX #define U64_MAX UINT64_MAX
typedef uint8_t u8; typedef uint8_t u8;
typedef uint16_t u16; typedef uint16_t u16;
typedef uint32_t u32; typedef uint32_t u32;
typedef uint64_t u64; typedef uint64_t u64;
typedef int8_t s8; typedef int8_t s8;
typedef int16_t s16; typedef int16_t s16;
typedef int32_t s32; typedef int32_t s32;
typedef int64_t s64; typedef int64_t s64;
typedef volatile u8 vu8; typedef volatile u8 vu8;
typedef volatile u16 vu16; typedef volatile u16 vu16;
typedef volatile u32 vu32; typedef volatile u32 vu32;
typedef volatile u64 vu64; typedef volatile u64 vu64;
typedef volatile s8 vs8; typedef volatile s8 vs8;
typedef volatile s16 vs16; typedef volatile s16 vs16;
typedef volatile s32 vs32; typedef volatile s32 vs32;
typedef volatile s64 vs64; typedef volatile s64 vs64;
#endif #endif

24
source/ios_mcp/source/utils.c
View File

@ -8,31 +8,31 @@
#include "logger.h" #include "logger.h"
// https://gist.github.com/ccbrown/9722406 // https://gist.github.com/ccbrown/9722406
void dumpHex(const void* data, size_t size) { void dumpHex(const void *data, size_t size) {
char ascii[17]; char ascii[17];
size_t i, j; size_t i, j;
ascii[16] = '\0'; ascii[16] = '\0';
DEBUG_FUNCTION_LINE("0x%08X (0x0000): ", data); DEBUG_FUNCTION_LINE("0x%08X (0x0000): ", data);
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
log_printf("%02X ", ((unsigned char*)data)[i]); log_printf("%02X ", ((unsigned char *) data)[i]);
if (((unsigned char*)data)[i] >= ' ' && ((unsigned char*)data)[i] <= '~') { if (((unsigned char *) data)[i] >= ' ' && ((unsigned char *) data)[i] <= '~') {
ascii[i % 16] = ((unsigned char*)data)[i]; ascii[i % 16] = ((unsigned char *) data)[i];
} else { } else {
ascii[i % 16] = '.'; ascii[i % 16] = '.';
} }
if ((i+1) % 8 == 0 || i+1 == size) { if ((i + 1) % 8 == 0 || i + 1 == size) {
log_printf(" "); log_printf(" ");
if ((i+1) % 16 == 0) { if ((i + 1) % 16 == 0) {
log_printf("| %s \n", ascii); log_printf("| %s \n", ascii);
if(i + 1 < size) { if (i + 1 < size) {
DEBUG_FUNCTION_LINE("0x%08X (0x%04X); ", data + i + 1,i+1); DEBUG_FUNCTION_LINE("0x%08X (0x%04X); ", data + i + 1, i + 1);
} }
} else if (i+1 == size) { } else if (i + 1 == size) {
ascii[(i+1) % 16] = '\0'; ascii[(i + 1) % 16] = '\0';
if ((i+1) % 16 <= 8) { if ((i + 1) % 16 <= 8) {
log_printf(" "); log_printf(" ");
} }
for (j = (i+1) % 16; j < 16; ++j) { for (j = (i + 1) % 16; j < 16; ++j) {
log_printf(" "); log_printf(" ");
} }
log_printf("| %s \n", ascii); log_printf("| %s \n", ascii);

2
source/ios_mcp/source/utils.h
View File

@ -8,7 +8,7 @@ extern "C" {
#endif #endif
//Need to have log_init() called beforehand. //Need to have log_init() called beforehand.
void dumpHex(const void* data, size_t size); void dumpHex(const void *data, size_t size);
#ifdef __cplusplus #ifdef __cplusplus
} }

104
source/ios_mcp/source/wupserver.c
View File

@ -16,19 +16,17 @@ static u8 threadStack[0x1000] __attribute__((aligned(0x20)));
// overwrites command_buffer with response // overwrites command_buffer with response
// returns length of response (or 0 for no response, negative for error) // returns length of response (or 0 for no response, negative for error)
static int serverCommandHandler(u32* command_buffer, u32 length) static int serverCommandHandler(u32 *command_buffer, u32 length) {
{ if (!command_buffer || !length) return -1;
if(!command_buffer || !length) return -1;
int out_length = 4; int out_length = 4;
switch(command_buffer[0]) switch (command_buffer[0]) {
{
case 0: case 0:
// write // write
// [cmd_id][addr] // [cmd_id][addr]
{ {
void* dst = (void*)command_buffer[1]; void *dst = (void *) command_buffer[1];
memcpy(dst, &command_buffer[2], length - 8); memcpy(dst, &command_buffer[2], length - 8);
} }
@ -37,7 +35,7 @@ static int serverCommandHandler(u32* command_buffer, u32 length)
// read // read
// [cmd_id][addr][length] // [cmd_id][addr][length]
{ {
void* src = (void*)command_buffer[1]; void *src = (void *) command_buffer[1];
length = command_buffer[2]; length = command_buffer[2];
memcpy(&command_buffer[1], src, length); memcpy(&command_buffer[1], src, length);
@ -57,7 +55,7 @@ static int serverCommandHandler(u32* command_buffer, u32 length)
// return error code as data // return error code as data
out_length = 8; out_length = 8;
command_buffer[1] = ((int (*const)(u32, u32, u32, u32, u32, u32, u32, u32))(MCP_SVC_BASE + svc_id * 8))(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7]); command_buffer[1] = ((int (*const)(u32, u32, u32, u32, u32, u32, u32, u32)) (MCP_SVC_BASE + svc_id * 8))(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7]);
} }
break; break;
case 3: case 3:
@ -72,8 +70,8 @@ static int serverCommandHandler(u32* command_buffer, u32 length)
// memcpy // memcpy
// [dst][src][size] // [dst][src][size]
{ {
void* dst = (void*)command_buffer[1]; void *dst = (void *) command_buffer[1];
void* src = (void*)command_buffer[2]; void *src = (void *) command_buffer[2];
int size = command_buffer[3]; int size = command_buffer[3];
memcpy(dst, src, size); memcpy(dst, src, size);
@ -83,26 +81,22 @@ static int serverCommandHandler(u32* command_buffer, u32 length)
// repeated-write // repeated-write
// [address][value][n] // [address][value][n]
{ {
u32* dst = (u32*)command_buffer[1]; u32 *dst = (u32 *) command_buffer[1];
u32* cache_range = (u32*)(command_buffer[1] & ~0xFF); u32 *cache_range = (u32 *) (command_buffer[1] & ~0xFF);
u32 value = command_buffer[2]; u32 value = command_buffer[2];
u32 n = command_buffer[3]; u32 n = command_buffer[3];
u32 old = *dst; u32 old = *dst;
int i; int i;
for(i = 0; i < n; i++) for (i = 0; i < n; i++) {
{ if (*dst != old) {
if(*dst != old) if (*dst == 0x0) old = *dst;
{ else {
if(*dst == 0x0) old = *dst;
else
{
*dst = value; *dst = value;
svcFlushDCache(cache_range, 0x100); svcFlushDCache(cache_range, 0x100);
break; break;
} }
}else } else {
{
svcInvalidateDCache(cache_range, 0x100); svcInvalidateDCache(cache_range, 0x100);
usleep(50); usleep(50);
} }
@ -120,23 +114,19 @@ static int serverCommandHandler(u32* command_buffer, u32 length)
return out_length; return out_length;
} }
static void serverClientHandler(int sock) static void serverClientHandler(int sock) {
{
u32 command_buffer[0x180]; u32 command_buffer[0x180];
while(!serverKilled) while (!serverKilled) {
{
int ret = recv(sock, command_buffer, sizeof(command_buffer), 0); int ret = recv(sock, command_buffer, sizeof(command_buffer), 0);
if(ret <= 0) break; if (ret <= 0) break;
ret = serverCommandHandler(command_buffer, ret); ret = serverCommandHandler(command_buffer, ret);
if(ret > 0) if (ret > 0) {
{
send(sock, command_buffer, ret, 0); send(sock, command_buffer, ret, 0);
}else if(ret < 0) } else if (ret < 0) {
{
send(sock, &ret, sizeof(int), 0); send(sock, &ret, sizeof(int), 0);
} }
} }
@ -144,8 +134,7 @@ static void serverClientHandler(int sock)
closesocket(sock); closesocket(sock);
} }
static void serverListenClients() static void serverListenClients() {
{
serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
struct sockaddr_in server; struct sockaddr_in server;
@ -156,22 +145,19 @@ static void serverListenClients()
server.sin_port = 1337; server.sin_port = 1337;
server.sin_addr.s_addr = 0; server.sin_addr.s_addr = 0;
if(bind(serverSocket, (struct sockaddr *)&server, sizeof(server)) < 0) if (bind(serverSocket, (struct sockaddr *) &server, sizeof(server)) < 0) {
{
closesocket(serverSocket); closesocket(serverSocket);
return; return;
} }
if(listen(serverSocket, 1) < 0) if (listen(serverSocket, 1) < 0) {
{
closesocket(serverSocket); closesocket(serverSocket);
return; return;
} }
while(!serverKilled) while (!serverKilled) {
{
int csock = accept(serverSocket, NULL, NULL); int csock = accept(serverSocket, NULL, NULL);
if(csock < 0) if (csock < 0)
break; break;
serverClientHandler(csock); serverClientHandler(csock);
@ -181,31 +167,27 @@ static void serverListenClients()
serverSocket = -1; serverSocket = -1;
} }
static int wupserver_thread(void *arg) static int wupserver_thread(void *arg) {
{ while (ifmgrnclInit() <= 0) {
while(ifmgrnclInit() <= 0)
{
//print(0, 0, "opening /dev/net/ifmgr/ncl..."); //print(0, 0, "opening /dev/net/ifmgr/ncl...");
usleep(1000); usleep(1000);
} }
while(true) while (true) {
{
u16 out0, out1; u16 out0, out1;
int ret0 = IFMGRNCL_GetInterfaceStatus(0, &out0); int ret0 = IFMGRNCL_GetInterfaceStatus(0, &out0);
if(!ret0 && out0 == 1) break; if (!ret0 && out0 == 1) break;
int ret1 = IFMGRNCL_GetInterfaceStatus(1, &out1); int ret1 = IFMGRNCL_GetInterfaceStatus(1, &out1);
if(!ret1 && out1 == 1) break; if (!ret1 && out1 == 1) break;
//print(0, 0, "initializing /dev/net/ifmgr/ncl... %08X %08X %08X %08X ", ret0, ret1, out0, out1); //print(0, 0, "initializing /dev/net/ifmgr/ncl... %08X %08X %08X %08X ", ret0, ret1, out0, out1);
usleep(1000); usleep(1000);
} }
while(socketInit() <= 0) while (socketInit() <= 0) {
{
//print(0, 0, "opening /dev/socket..."); //print(0, 0, "opening /dev/socket...");
usleep(1000); usleep(1000);
} }
@ -217,38 +199,32 @@ static int wupserver_thread(void *arg)
#endif #endif
//print(0, 0, "opened /dev/socket !"); //print(0, 0, "opened /dev/socket !");
usleep(5*1000*1000); usleep(5 * 1000 * 1000);
//print(0, 10, "attempting sockets !"); //print(0, 10, "attempting sockets !");
while(1) while (1) {
{ if (!serverKilled) {
if(!serverKilled)
{
serverListenClients(); serverListenClients();
} } else {
else
{
break; break;
} }
usleep(1000*1000); usleep(1000 * 1000);
} }
log_deinit(); log_deinit();
return 0; return 0;
} }
void wupserver_init(void) void wupserver_init(void) {
{
serverSocket = -1; serverSocket = -1;
serverKilled = 0; serverKilled = 0;
int threadId = svcCreateThread(wupserver_thread, 0, (u32*)(threadStack + sizeof(threadStack)), sizeof(threadStack), 0x78, 1); int threadId = svcCreateThread(wupserver_thread, 0, (u32 *) (threadStack + sizeof(threadStack)), sizeof(threadStack), 0x78, 1);
if(threadId >= 0) if (threadId >= 0)
svcStartThread(threadId); svcStartThread(threadId);
} }
void wupserver_deinit(void) void wupserver_deinit(void) {
{
serverKilled = 1; serverKilled = 1;
shutdown(serverSocket, SHUT_RDWR); shutdown(serverSocket, SHUT_RDWR);
} }

1
source/ios_mcp/source/wupserver.h
View File

@ -2,6 +2,7 @@
#define WUPSERVER_H #define WUPSERVER_H
void wupserver_init(void); void wupserver_init(void);
void wupserver_deinit(void); void wupserver_deinit(void);
#endif #endif

10
source/ios_usb/source/main.c
View File

@ -1,11 +1,10 @@
void _main() void _main() {
{
void(*ios_shutdown)(int) = (void(*)(int))0x1012EE4C; void (*ios_shutdown)(int) = (void (*)(int)) 0x1012EE4C;
int(*reply)(int, int) = (int(*)(int, int))0x1012ED04; int (*reply)(int, int) = (int (*)(int, int)) 0x1012ED04;
int saved_handle = *(volatile int*)0x0012F000; int saved_handle = *(volatile int *) 0x0012F000;
int myret = reply(saved_handle, 0); int myret = reply(saved_handle, 0);
if (myret != 0) if (myret != 0)
ios_shutdown(1); ios_shutdown(1);
@ -22,5 +21,4 @@ void _main()
"newpc: .word 0x10111164\n"); "newpc: .word 0x10111164\n");
} }

4
source/main.cpp
View File

@ -15,8 +15,8 @@ int main(int argc, char **argv) {
WHBLogUdpInit(); WHBLogUdpInit();
WHBLogPrintf("Hello from mocha"); WHBLogPrintf("Hello from mocha");
unsigned long long sysmenuIdUll = _SYSGetSystemApplicationTitleId(0); unsigned long long sysmenuIdUll = _SYSGetSystemApplicationTitleId(0);
memcpy((void*)0xF417FFF0, &sysmenuIdUll, 8); memcpy((void *) 0xF417FFF0, &sysmenuIdUll, 8);
DCStoreRange((void*)0xF417FFF0,0x8); DCStoreRange((void *) 0xF417FFF0, 0x8);
ExecuteIOSExploit(); ExecuteIOSExploit();
WHBLogPrintf("Bye from mocha"); WHBLogPrintf("Bye from mocha");