libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-16 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5790 from sum2012/scedmac

Browse Source 
Further illegal size check in sceDmacMemcpy
This commit is contained in:
Henrik Rydgård 2014-04-03 17:16:39 +02:00
commit 19000c7a37
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Core/HLE/sceDmac.cpp
View File

@ -16,6 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Core/HLE/sceDmac.h"
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/MemMap.h" #include "Core/MemMap.h"
#include "Core/Reporting.h" #include "Core/Reporting.h"
@ -75,9 +76,9 @@ u32 sceDmacMemcpy(u32 dst, u32 src, u32 size) {
ERROR_LOG(HLE, "sceDmacMemcpy(dest=%08x, src=%08x, size=%i): invalid address", dst, src, size); ERROR_LOG(HLE, "sceDmacMemcpy(dest=%08x, src=%08x, size=%i): invalid address", dst, src, size);
return SCE_KERNEL_ERROR_INVALID_POINTER; return SCE_KERNEL_ERROR_INVALID_POINTER;
} }
if (dst + size >= 0x80000000 || src + size >= 0x80000000 || size == 0xFFFFFFFF) { if (dst + size >= 0x80000000 || src + size >= 0x80000000 || size >= 0x80000000) {
ERROR_LOG(HLE, "sceDmacMemcpy(dest=%08x, src=%08x, size=%i): illegal size", dst, src, size); ERROR_LOG(HLE, "sceDmacMemcpy(dest=%08x, src=%08x, size=%i): illegal size", dst, src, size);
return 0x80000023; return SCE_ERROR_PRIV_REQUIRED;
} }
if (dmacMemcpyDeadline > CoreTiming::GetTicks()) { if (dmacMemcpyDeadline > CoreTiming::GetTicks()) {
@ -100,9 +101,9 @@ u32 sceDmacTryMemcpy(u32 dst, u32 src, u32 size) {
ERROR_LOG(HLE, "sceDmacTryMemcpy(dest=%08x, src=%08x, size=%i): invalid address", dst, src, size); ERROR_LOG(HLE, "sceDmacTryMemcpy(dest=%08x, src=%08x, size=%i): invalid address", dst, src, size);
return SCE_KERNEL_ERROR_INVALID_POINTER; return SCE_KERNEL_ERROR_INVALID_POINTER;
} }
if (dst + size >= 0x80000000 || src + size >= 0x80000000 || size == 0xFFFFFFFF) { if (dst + size >= 0x80000000 || src + size >= 0x80000000 || size >= 0x80000000) {
ERROR_LOG(HLE, "sceDmacTryMemcpy(dest=%08x, src=%08x, size=%i): illegal size", dst, src, size); ERROR_LOG(HLE, "sceDmacTryMemcpy(dest=%08x, src=%08x, size=%i): illegal size", dst, src, size);
return 0x80000023; return SCE_ERROR_PRIV_REQUIRED;
} }
if (dmacMemcpyDeadline > CoreTiming::GetTicks()) { if (dmacMemcpyDeadline > CoreTiming::GetTicks()) {

4
Core/HLE/sceDmac.h
View File

@ -19,6 +19,10 @@
class PointerWrap; class PointerWrap;
enum {
SCE_ERROR_PRIV_REQUIRED = 0x80000023,
};
void __DmacInit(); void __DmacInit();
void __DmacDoState(PointerWrap &p); void __DmacDoState(PointerWrap &p);