ryujinx-backup/Ryujinx
3
6
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix virtual memory allocation being out of range (#2464)

Browse source
This commit is contained in:
gdkchan 2021-07-11 16:24:31 -03:00 committed by GitHub
parent 0d841c8d51
commit b5190f1681
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs
View file

@ -2411,9 +2411,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
{ {
if (info.State == MemoryState.Unmapped) if (info.State == MemoryState.Unmapped)
{ {
ulong currBaseAddr = info.Address + reservedSize; ulong currBaseAddr = info.Address <= regionStart ? regionStart : info.Address;
ulong currEndAddr = info.Address + info.Size - 1; ulong currEndAddr = info.Address + info.Size - 1;
currBaseAddr += reservedSize;
ulong address = BitUtils.AlignDown(currBaseAddr, alignment) + reservedStart; ulong address = BitUtils.AlignDown(currBaseAddr, alignment) + reservedStart;
if (currBaseAddr > address) if (currBaseAddr > address)
@ -2423,9 +2425,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
ulong allocationEndAddr = address + totalNeededSize - 1; ulong allocationEndAddr = address + totalNeededSize - 1;
if (allocationEndAddr <= regionEndAddr && if (info.Address <= address &&
allocationEndAddr <= currEndAddr && address < allocationEndAddr &&
address < allocationEndAddr) allocationEndAddr <= regionEndAddr &&
allocationEndAddr <= currEndAddr)
{ {
return address; return address;
} }