aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silsby2019-11-08 20:30:04 -0500
committerDaniel Silsby2019-11-08 20:30:04 -0500
commit7194a46a0eb7583f7af0b5807e6ffde006733111 (patch)
tree70dd67df94bcb59e76c5c54143c72e8e354d2d66
parent3c8913013a3bb1908186342759f881baa16602b9 (diff)
downloadpcsx_rearmed-7194a46a0eb7583f7af0b5807e6ffde006733111.tar.gz
pcsx_rearmed-7194a46a0eb7583f7af0b5807e6ffde006733111.tar.bz2
pcsx_rearmed-7194a46a0eb7583f7af0b5807e6ffde006733111.zip
gpulib: fix out-of-bounds reads in do_cmd_buffer()
When gpu.cmd_buffer[] is filling up, and the last 1 or 2 words in it are the beginning of a new vram read/write cmd, do_cmd_buffer() would access out-of-bounds, reading garbage pos/size data. Fixes corrupted gfx in this PS1 .exe test utility: https://github.com/PeterLemon/PSX/tree/master/CPUTest/CPU/LOADSTORE/LW (This and all similar tests on Peter's site). Note that gfx access in this utility is done entirely through cmds given through GPUwriteData(), i.e. direct CPU->GP0 stores, not DMA.
-rw-r--r--plugins/gpulib/gpu.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/gpulib/gpu.c b/plugins/gpulib/gpu.c
index 125bd89..d67df03 100644
--- a/plugins/gpulib/gpu.c
+++ b/plugins/gpulib/gpu.c
@@ -457,6 +457,12 @@ static noinline int do_cmd_buffer(uint32_t *data, int count)
cmd = data[pos] >> 24;
if (0xa0 <= cmd && cmd <= 0xdf) {
+ if (unlikely((pos+2) >= count)) {
+ // incomplete vram write/read cmd, can't consume yet
+ cmd = -1;
+ break;
+ }
+
// consume vram write/read cmd
start_vram_transfer(data[pos + 1], data[pos + 2], (cmd & 0xe0) == 0xc0);
pos += 3;