The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-11 06:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

DiscIO: Safety check when allocating memory for TMD

Browse Source
This commit is contained in:
JosJuice 2014-12-03 10:54:09 +01:00
parent a09283cf9f
commit a2566bd397
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -11,6 +11,7 @@
#include "Common/CommonFuncs.h" #include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "DiscIO/Blob.h" #include "DiscIO/Blob.h"
#include "DiscIO/Volume.h" #include "DiscIO/Volume.h"
@ -108,19 +109,31 @@ bool CVolumeWiiCrypted::GetTitleID(u8* _pBuffer) const
// TitleID offset in tik is 0x1DC // TitleID offset in tik is 0x1DC
return RAWRead(m_VolumeOffset + 0x1DC, 8, _pBuffer); return RAWRead(m_VolumeOffset + 0x1DC, 8, _pBuffer);
} }
std::unique_ptr<u8[]> CVolumeWiiCrypted::GetTMD(u32 *_sz) const
{
*_sz = 0;
u32 tmdSz,
tmdAddr;
RAWRead(m_VolumeOffset + 0x2a4, sizeof(u32), (u8*)&tmdSz); std::unique_ptr<u8[]> CVolumeWiiCrypted::GetTMD(u32 *size) const
RAWRead(m_VolumeOffset + 0x2a8, sizeof(u32), (u8*)&tmdAddr); {
tmdSz = Common::swap32(tmdSz); *size = 0;
tmdAddr = Common::swap32(tmdAddr) << 2; u32 tmd_size;
std::unique_ptr<u8[]> buf{new u8[tmdSz]}; u32 tmd_address;
RAWRead(m_VolumeOffset + tmdAddr, tmdSz, buf.get());
*_sz = tmdSz; RAWRead(m_VolumeOffset + 0x2a4, sizeof(u32), (u8*)&tmd_size);
RAWRead(m_VolumeOffset + 0x2a8, sizeof(u32), (u8*)&tmd_address);
tmd_size = Common::swap32(tmd_size);
tmd_address = Common::swap32(tmd_address) << 2;
if (tmd_size > 1024 * 1024 * 4)
{
// The size is checked so that a malicious or corrupt ISO
// can't force Dolphin to allocate up to 4 GiB of memory.
// 4 MiB should be much bigger than the size of TMDs and much smaller
// than the amount of RAM in a computer that can run Dolphin.
PanicAlert("TMD > 4 MiB");
tmd_size = 1024 * 1024 * 4;
}
std::unique_ptr<u8[]> buf{ new u8[tmd_size] };
RAWRead(m_VolumeOffset + tmd_address, tmd_size, buf.get());
*size = tmd_size;
return buf; return buf;
} }