ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8558 from JosJuice/volume-oob 

DiscIO: Add out of bounds checks for blob reading
This commit is contained in:
Tilka 2020-01-15 13:48:00 +00:00 committed by GitHub
parent 1ac3264d5d 297b790e4f
commit 1cc7ef356b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DiscIO/Blob.cpp
View File

@ -96,6 +96,9 @@ const SectorReader::Cache* SectorReader::GetCacheLine(u64 block_num)
bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr) bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr)
{ {
if (offset + size > GetDataSize())
return false;
u64 remain = size; u64 remain = size;
u64 block = 0; u64 block = 0;
u32 position_in_block = static_cast<u32>(offset % m_block_size); u32 position_in_block = static_cast<u32>(offset % m_block_size);

3
Source/Core/DiscIO/CISOBlob.cpp
View File

@ -49,6 +49,9 @@ u64 CISOFileReader::GetRawSize() const
bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
{ {
if (offset + nbytes > GetDataSize())
return false;
while (nbytes != 0) while (nbytes != 0)
{ {
u64 const block = offset / m_block_size; u64 const block = offset / m_block_size;

6
Source/Core/DiscIO/DirectoryBlob.cpp
View File

@ -375,6 +375,9 @@ DirectoryBlobReader::DirectoryBlobReader(const std::string& game_partition_root,
bool DirectoryBlobReader::Read(u64 offset, u64 length, u8* buffer) bool DirectoryBlobReader::Read(u64 offset, u64 length, u8* buffer)
{ {
if (offset + length > m_data_size)
return false;
// TODO: We don't handle raw access to the encrypted area of Wii discs correctly. // TODO: We don't handle raw access to the encrypted area of Wii discs correctly.
return (m_is_wii ? m_nonpartition_contents : m_gamecube_pseudopartition.GetContents()) return (m_is_wii ? m_nonpartition_contents : m_gamecube_pseudopartition.GetContents())
.Read(offset, length, buffer); .Read(offset, length, buffer);
@ -394,6 +397,9 @@ bool DirectoryBlobReader::ReadWiiDecrypted(u64 offset, u64 size, u8* buffer, u64
if (it == m_partitions.end()) if (it == m_partitions.end())
return false; return false;
if (offset + size > it->second.GetDataSize())
return false;
return it->second.GetContents().Read(offset, size, buffer); return it->second.GetContents().Read(offset, size, buffer);
} }

3
Source/Core/DiscIO/WbfsBlob.cpp
View File

@ -115,6 +115,9 @@ bool WbfsFileReader::ReadHeader()
bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
{ {
if (offset + nbytes > GetDataSize())
return false;
while (nbytes) while (nbytes)
{ {
u64 read_size; u64 read_size;