diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2022-10-04 20:12:54 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 20:12:54 -0300 |
| commit | 60e16c15b6e9351371711356d205a12435b3c574 (patch) | |
| tree | cbfa8d94a83752419defba6ca2a953d558e5c236 /Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs | |
| parent | 2068445939e1b39f3e07f64aa11b93491d1116a7 (diff) | |
Fix memory corruption in BCAT and FS Read methods when buffer is larger than needed (#3739)1.1.294
* Fix memory corruption in FS Read methods when buffer is larger than needed
* PR feedback
* nit: Don't move this around
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs index 9dbfd2b0..5359cadd 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs @@ -23,21 +23,21 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy if (context.Request.ReceiveBuff.Count > 0) { - IpcBuffDesc buffDesc = context.Request.ReceiveBuff[0]; + ulong bufferAddress = context.Request.ReceiveBuff[0].Position; + ulong bufferLen = context.Request.ReceiveBuff[0].Size; // Use smaller length to avoid overflows. - if (size > buffDesc.Size) + if (size > bufferLen) { - size = buffDesc.Size; + size = bufferLen; } - byte[] data = new byte[size]; - - Result result = _baseStorage.Get.Read((long)offset, new OutBuffer(data), (long)size); - - context.Memory.Write(buffDesc.Position, data); + using (var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true)) + { + Result result = _baseStorage.Get.Read((long)offset, new OutBuffer(region.Memory.Span), (long)size); - return (ResultCode)result.Value; + return (ResultCode)result.Value; + } } return ResultCode.Success; |