RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 20:22:30 +01:00
Code Issues Releases Wiki Activity

USIO: Do not crash simply due to invalid commands

Browse Source
This commit is contained in:
brian218 2023-01-18 10:23:06 +08:00 committed by Megamouse
parent 0e64c74a78
commit c3c2bb7ad8
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpcs3/Emu/Io/usio.cpp
View File

@ -76,6 +76,7 @@ usb_device_usio::usb_device_usio(const std::array<u8, 7>& location)
.wMaxPacketSize = 0x0008, .wMaxPacketSize = 0x0008,
.bInterval = 16})); .bInterval = 16}));
g_fxo->get<usio_memory>().backup_memory.clear();
g_fxo->get<usio_memory>().backup_memory.resize(0xB8); g_fxo->get<usio_memory>().backup_memory.resize(0xB8);
g_fxo->get<usio_memory>().last_game_status.clear(); g_fxo->get<usio_memory>().last_game_status.clear();
g_fxo->get<usio_memory>().last_game_status.resize(0x28); g_fxo->get<usio_memory>().last_game_status.resize(0x28);
@ -512,7 +513,12 @@ void usb_device_usio::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, Us
} }
// Commands // Commands
ensure(buf_size == 6, "Expected a command but buf_size != 6"); if (buf_size != 6)
{
usio_log.error("Expected a command but buf_size != 6");
return;
}
usio_channel = buf[0] & 0xF; usio_channel = buf[0] & 0xF;
usio_register = *reinterpret_cast<le_t<u16>*>(&buf[2]); usio_register = *reinterpret_cast<le_t<u16>*>(&buf[2]);
usio_length = *reinterpret_cast<le_t<u16>*>(&buf[4]); usio_length = *reinterpret_cast<le_t<u16>*>(&buf[4]);
@ -520,7 +526,11 @@ void usb_device_usio::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, Us
if ((buf[0] & USIO_COMMAND_WRITE) == USIO_COMMAND_WRITE) if ((buf[0] & USIO_COMMAND_WRITE) == USIO_COMMAND_WRITE)
{ {
usio_log.trace("UsioWrite(Channel: 0x%02X, Register: 0x%04X, Length: 0x%04X)", usio_channel, usio_register, usio_length); usio_log.trace("UsioWrite(Channel: 0x%02X, Register: 0x%04X, Length: 0x%04X)", usio_channel, usio_register, usio_length);
ensure(((~(usio_register >> 8)) & 0xF0) == buf[1]); if (((~(usio_register >> 8)) & 0xF0) != buf[1])
{
usio_log.error("Invalid UsioWrite command");
return;
}
expecting_data = true; expecting_data = true;
usio_data.clear(); usio_data.clear();
} }