From 1f37ce65bb6f359ec077163c505fb9cef60ca5b9 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 21 Jun 2020 10:24:10 +0800 Subject: [PATCH 1/4] Add sysclib_strncmp,sysclib_memmove Add a memory check in sysclib_strstr ref: https://github.com/jpcsp/jpcsp/blob/master/src/jpcsp/HLE/modules/SysclibForKernel.java#L107 --- Core/HLE/FunctionWrappers.h | 5 +++++ Core/HLE/sceKernelInterrupt.cpp | 35 +++++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/Core/HLE/FunctionWrappers.h b/Core/HLE/FunctionWrappers.h index 01124ea157..4b9e6c2853 100644 --- a/Core/HLE/FunctionWrappers.h +++ b/Core/HLE/FunctionWrappers.h @@ -201,6 +201,11 @@ template void WrapI_UU() { RETURN(retval); } +template void WrapI_UUU() { + int retval = func(PARAM(0), PARAM(1), PARAM(2)); + RETURN(retval); +} + template void WrapI_UFF() { // Not sure about the float arguments. int retval = func(PARAM(0), PARAMF(0), PARAMF(1)); diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 18c8cfb35c..661010aa38 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -754,13 +754,34 @@ static u32 sysclib_memset(u32 destAddr, int data, int size) { static int sysclib_strstr(u32 s1, u32 s2) { ERROR_LOG(SCEKERNEL, "Untested sysclib_strstr(%08x, %08x)", s1, s2); - std::string str1 = Memory::GetCharPointer(s1); - std::string str2 = Memory::GetCharPointer(s2); - size_t index = str1.find(str2); - if (index == str1.npos) { - return 0; + if (Memory::IsValidAddress(s1) && Memory::IsValidAddress(s2)) { + std::string str1 = Memory::GetCharPointer(s1); + std::string str2 = Memory::GetCharPointer(s2); + size_t index = str1.find(str2); + if (index == str1.npos) { + return 0; + } + return s1 + (uint32_t)index; } - return s1 + (uint32_t)index; + return 0; +} + +static int sysclib_strncmp(u32 s1, u32 s2, u32 size) { + ERROR_LOG(SCEKERNEL, "Untested sysclib_strncmp(%08x, %08x, x)", s1, s2, size); + if (Memory::IsValidAddress(s1) && Memory::IsValidAddress(s2)) { + const char * str1 = Memory::GetCharPointer(s1); + const char * str2 = Memory::GetCharPointer(s2); + return strncmp(str1, str2, size); + } + return 0; +} + +static int sysclib_memmove(u32 dst, u32 src, u32 size) { + ERROR_LOG(SCEKERNEL, "Untested sysclib_memmove(%08x, %08x, x)", dst, src, size); + if (Memory::IsValidRange(dst, size) && Memory::IsValidRange(src, size)) { + memmove(Memory::GetPointer(dst), Memory::GetPointer(src), size); + } + return 0; } const HLEFunction SysclibForKernel[] = @@ -774,6 +795,8 @@ const HLEFunction SysclibForKernel[] = {0x7661E728, &WrapI_UU, "sprintf", 'i', "xx", HLE_KERNEL_SYSCALL }, {0x10F3BB61, &WrapU_UII, "memset", 'x', "xii", HLE_KERNEL_SYSCALL }, {0x0D188658, &WrapI_UU, "strstr", 'i', "xx", HLE_KERNEL_SYSCALL }, + {0x7AB35214, &WrapI_UUU, "strncmp", 'i', "xxx", HLE_KERNEL_SYSCALL }, + {0xA48D2592, &WrapI_UUU, "memmove", 'i', "xxx", HLE_KERNEL_SYSCALL }, }; void Register_Kernel_Library() From de947a6f611f4a95678ac65940ebc639aebf7eeb Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 21 Jun 2020 11:21:11 +0800 Subject: [PATCH 2/4] Fix by @unknownbrackets --- Core/HLE/sceKernelInterrupt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 661010aa38..2b3da424ef 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -776,7 +776,7 @@ static int sysclib_strncmp(u32 s1, u32 s2, u32 size) { return 0; } -static int sysclib_memmove(u32 dst, u32 src, u32 size) { +static u32 sysclib_memmove(u32 dst, u32 src, u32 size) { ERROR_LOG(SCEKERNEL, "Untested sysclib_memmove(%08x, %08x, x)", dst, src, size); if (Memory::IsValidRange(dst, size) && Memory::IsValidRange(src, size)) { memmove(Memory::GetPointer(dst), Memory::GetPointer(src), size); @@ -796,7 +796,7 @@ const HLEFunction SysclibForKernel[] = {0x10F3BB61, &WrapU_UII, "memset", 'x', "xii", HLE_KERNEL_SYSCALL }, {0x0D188658, &WrapI_UU, "strstr", 'i', "xx", HLE_KERNEL_SYSCALL }, {0x7AB35214, &WrapI_UUU, "strncmp", 'i', "xxx", HLE_KERNEL_SYSCALL }, - {0xA48D2592, &WrapI_UUU, "memmove", 'i', "xxx", HLE_KERNEL_SYSCALL }, + {0xA48D2592, &WrapU_UUU, "memmove", 'x', "xxx", HLE_KERNEL_SYSCALL }, }; void Register_Kernel_Library() From fe68a21ea78d53bcef4337c2638c8c9c53975941 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 21 Jun 2020 11:23:14 +0800 Subject: [PATCH 3/4] oop --- Core/HLE/FunctionWrappers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/FunctionWrappers.h b/Core/HLE/FunctionWrappers.h index 4b9e6c2853..0233dd7bdd 100644 --- a/Core/HLE/FunctionWrappers.h +++ b/Core/HLE/FunctionWrappers.h @@ -201,7 +201,7 @@ template void WrapI_UU() { RETURN(retval); } -template void WrapI_UUU() { +template void WrapU_UUU() { int retval = func(PARAM(0), PARAM(1), PARAM(2)); RETURN(retval); } From d691627a35474420a9e50a9a4afdc32e9de1cec9 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 21 Jun 2020 11:36:02 +0800 Subject: [PATCH 4/4] oop --- Core/HLE/FunctionWrappers.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Core/HLE/FunctionWrappers.h b/Core/HLE/FunctionWrappers.h index 0233dd7bdd..01124ea157 100644 --- a/Core/HLE/FunctionWrappers.h +++ b/Core/HLE/FunctionWrappers.h @@ -201,11 +201,6 @@ template void WrapI_UU() { RETURN(retval); } -template void WrapU_UUU() { - int retval = func(PARAM(0), PARAM(1), PARAM(2)); - RETURN(retval); -} - template void WrapI_UFF() { // Not sure about the float arguments. int retval = func(PARAM(0), PARAMF(0), PARAMF(1));