Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14732 from khang06/small-tmd-check

Browse Source 
IOS/ES: Prevent reading TMDs that are too small
This commit is contained in:
Admiral H. Curtiss authored and GitHub committed 2026-07-15 22:08:12 +02:00
2 parents fd8391a852 900febec29
commit 81402ca6aa
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/Core/IOS/ES/Formats.cpp
+1 -1
View File
@@ -194,7 +194,7 @@ void SignedBlobReader::DoState(PointerWrap& p)
bool IsValidTMDSize(size_t size) bool IsValidTMDSize(size_t size)
{ {
return size <= 0x49e4; return size >= sizeof(TMDHeader) && size <= 0x49e4;
} }
TMDReader::TMDReader(std::vector<u8> bytes) : SignedBlobReader(std::move(bytes)) TMDReader::TMDReader(std::vector<u8> bytes) : SignedBlobReader(std::move(bytes))
Source/Core/Core/IOS/WFS/WFSI.cpp
+1 -1
View File
@@ -156,7 +156,7 @@ std::optional<IPCReply> WFSIDevice::IOCtl(const IOCtlRequest& request)
if (!ES::IsValidTMDSize(tmd_size)) if (!ES::IsValidTMDSize(tmd_size))
{ {
ERROR_LOG_FMT(IOS_WFS, "IOCTL_WFSI_IMPORT_TITLE_INIT: TMD size too large ({})", tmd_size); ERROR_LOG_FMT(IOS_WFS, "IOCTL_WFSI_IMPORT_TITLE_INIT: TMD size invalid ({})", tmd_size);
return_error_code = IPC_EINVAL; return_error_code = IPC_EINVAL;
break; break;
} }
Source/Core/DiscIO/VolumeWad.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ VolumeWAD::VolumeWAD(std::unique_ptr<BlobReader> reader) : m_reader(std::move(re
if (!IOS::ES::IsValidTMDSize(m_tmd_size)) if (!IOS::ES::IsValidTMDSize(m_tmd_size))
{ {
ERROR_LOG_FMT(DISCIO, "TMD is too large: {} bytes", m_tmd_size); ERROR_LOG_FMT(DISCIO, "TMD has an invalid size: {} bytes", m_tmd_size);
return; return;
} }