mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-12 00:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Crypto/sys_fs: Fix potential RAM shortage in NPDRM decryption

Browse Source 
Previous code was structured very naively: if 8GB read is requested, it would allocate 8GB of memory. Without considering recycling memory for each block.
This commit is contained in:
Eladash 2024-02-02 21:35:22 +02:00 committed by Elad.Ash
parent d38b2eb8ef
commit 596e671973
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rpcs3/Crypto/unedat.cpp
View File

@ -992,28 +992,33 @@ u64 EDATADecrypter::ReadData(u64 pos, u8* data, u64 size)
const u64 startOffset = pos % edatHeader.block_size; const u64 startOffset = pos % edatHeader.block_size;
const u64 num_blocks = utils::aligned_div(startOffset + size, edatHeader.block_size); const u64 num_blocks = utils::aligned_div(startOffset + size, edatHeader.block_size);
data_buf.resize(num_blocks * edatHeader.block_size);
// Find and decrypt block range covering pos + size // Find and decrypt block range covering pos + size
const u32 starting_block = ::narrow<u32>(pos / edatHeader.block_size); const u32 starting_block = ::narrow<u32>(pos / edatHeader.block_size);
const u32 ending_block = ::narrow<u32>(std::min<u64>(starting_block + num_blocks, total_blocks)); const u32 ending_block = ::narrow<u32>(std::min<u64>(starting_block + num_blocks, total_blocks));
u64 writeOffset = 0; u64 writeOffset = 0;
for (u32 i = starting_block; i < ending_block; ++i) std::vector<u8> data_buf(edatHeader.block_size);
for (u32 i = starting_block; i < ending_block; i++)
{ {
edata_file.seek(0); u64 res = decrypt_block(&edata_file, data_buf.data(), &edatHeader, &npdHeader, reinterpret_cast<uchar*>(&dec_key), i, total_blocks, edatHeader.file_size);
u64 res = decrypt_block(&edata_file, &data_buf[writeOffset], &edatHeader, &npdHeader, reinterpret_cast<uchar*>(&dec_key), i, total_blocks, edatHeader.file_size);
if (res == umax) if (res == umax)
{ {
edat_log.error("Error Decrypting data"); edat_log.error("Error Decrypting data");
return 0; return 0;
} }
writeOffset += res; const usz skip_start = (i == starting_block ? startOffset : 0);
const usz end_block = (i != total_blocks - 1 ? edatHeader.block_size : edatHeader.file_size % edatHeader.block_size);
const usz skip_end = (i == ending_block - 1 ? (end_block - (startOffset + size)) % edatHeader.block_size : 0);
std::memcpy(data + writeOffset, data_buf.data() + skip_start, res - skip_start - skip_end);
std::memset(data_buf.data(), 0, res - skip_start - skip_end);
writeOffset += res - skip_start - skip_end;
} }
const u64 bytesWrote = std::min<u64>(writeOffset - startOffset, size); return writeOffset;
memcpy(data, &data_buf[startOffset], bytesWrote);
return bytesWrote;
} }

3
rpcs3/Crypto/unedat.h
View File

@ -79,9 +79,6 @@ struct EDATADecrypter final : fs::file_base
NPD_HEADER npdHeader{}; NPD_HEADER npdHeader{};
EDAT_HEADER edatHeader{}; EDAT_HEADER edatHeader{};
// Internal data buffers.
std::vector<u8> data_buf{};
u128 dec_key{}; u128 dec_key{};
public: public: