Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-28 05:37:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14691 from JosJuice/bba-memory-safety

Browse Source 
EXI/BBA: Fix tx_fifo memory safety issues
This commit is contained in:
JosJuice
2026-06-21 21:43:50 +02:00
committed by GitHub
parent 79322e77b0 95f3f8c6df
commit 6bdf00ed21
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
View File

@@ -435,7 +435,11 @@ void CEXIETHERNET::DirectFIFOWrite(const u8* data, u32 size)
// GMAC instead of finagling with packet descriptors and such
u16* tx_fifo_count = (u16*)&mBbaMem[BBA_TXFIFOCNT];
memcpy(tx_fifo.get() + *tx_fifo_count, data, size);
if (data != nullptr && *tx_fifo_count < BBA_TXFIFO_SIZE)
{
const u32 max_size = BBA_TXFIFO_SIZE - *tx_fifo_count;
memcpy(tx_fifo.get() + *tx_fifo_count, data, std::min(size, max_size));
}
*tx_fifo_count += size;
// TODO: not sure this mask is correct.
@@ -447,7 +451,7 @@ void CEXIETHERNET::DirectFIFOWrite(const u8* data, u32 size)
void CEXIETHERNET::SendFromDirectFIFO()
{
const u8* frame = tx_fifo.get();
const u16 size = Common::BitCastPtr<u16>(&mBbaMem[BBA_TXFIFOCNT]);
const u16 size = std::min<u16>(BBA_TXFIFO_SIZE, Common::BitCastPtr<u16>(&mBbaMem[BBA_TXFIFOCNT]));
if (m_network_interface->SendFrame(frame, size))
m_system.GetPowerPC().GetDebugInterface().NetworkLogger()->LogBBA(frame, size);
}