Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-30 00:08:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added memory block checks

Browse Source
This commit is contained in:
Alex 2023-03-03 16:14:06 +02:00
parent 6e4cfbcb8c
commit aeb175f03b
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Core/Memory/HeapAllocators/Xalloc/XallocV1.cpp
View File

@ -53,8 +53,9 @@ namespace Xalloc
Block(Xsize_t Size) Block(Xsize_t Size)
{ {
this->Size = Size;
this->Address = Xalloc_REQUEST_PAGES(XStoP(Size)); this->Address = Xalloc_REQUEST_PAGES(XStoP(Size));
this->Size = Size;
Xmemset(this->Address, 0, Size);
} }
~Block() ~Block()
@ -140,8 +141,6 @@ namespace Xalloc
{ {
this->FirstBlock = new Block(Size); this->FirstBlock = new Block(Size);
((Block *)this->FirstBlock)->IsFree = false; ((Block *)this->FirstBlock)->IsFree = false;
((Block *)this->FirstBlock)->Checksum = Xalloc_BlockChecksum;
Xmemset(((Block *)this->FirstBlock)->Address, 0, Size);
Xalloc_unlock; Xalloc_unlock;
return ((Block *)this->FirstBlock)->Address; return ((Block *)this->FirstBlock)->Address;
} }
@ -149,10 +148,13 @@ namespace Xalloc
Block *CurrentBlock = ((Block *)this->FirstBlock); Block *CurrentBlock = ((Block *)this->FirstBlock);
while (CurrentBlock != nullptr) while (CurrentBlock != nullptr)
{ {
if (CurrentBlock->IsFree && CurrentBlock->Size >= Size) if (!CurrentBlock->Check())
{
Xalloc_err("Block %#lx checksum failed!", (Xuint64_t)CurrentBlock);
}
else if (CurrentBlock->IsFree && CurrentBlock->Size >= Size)
{ {
CurrentBlock->IsFree = false; CurrentBlock->IsFree = false;
CurrentBlock->Checksum = Xalloc_BlockChecksum;
Xmemset(CurrentBlock->Address, 0, Size); Xmemset(CurrentBlock->Address, 0, Size);
Xalloc_unlock; Xalloc_unlock;
return CurrentBlock->Address; return CurrentBlock->Address;
@ -167,8 +169,6 @@ namespace Xalloc
CurrentBlock->Next = new Block(Size); CurrentBlock->Next = new Block(Size);
((Block *)CurrentBlock->Next)->Last = CurrentBlock; ((Block *)CurrentBlock->Next)->Last = CurrentBlock;
((Block *)CurrentBlock->Next)->IsFree = false; ((Block *)CurrentBlock->Next)->IsFree = false;
((Block *)CurrentBlock->Next)->Checksum = Xalloc_BlockChecksum;
Xmemset(((Block *)CurrentBlock->Next)->Address, 0, Size);
Xalloc_unlock; Xalloc_unlock;
return ((Block *)CurrentBlock->Next)->Address; return ((Block *)CurrentBlock->Next)->Address;
} }
@ -187,7 +187,11 @@ namespace Xalloc
Block *CurrentBlock = ((Block *)this->FirstBlock); Block *CurrentBlock = ((Block *)this->FirstBlock);
while (CurrentBlock != nullptr) while (CurrentBlock != nullptr)
{ {
if (CurrentBlock->Address == Address) if (!CurrentBlock->Check())
{
Xalloc_err("Block %#lx checksum failed!", (Xuint64_t)CurrentBlock);
}
else if (CurrentBlock->Address == Address)
{ {
if (CurrentBlock->IsFree) if (CurrentBlock->IsFree)
{ {
@ -197,7 +201,6 @@ namespace Xalloc
} }
CurrentBlock->IsFree = true; CurrentBlock->IsFree = true;
CurrentBlock->Checksum = Xalloc_BlockChecksum;
Xalloc_unlock; Xalloc_unlock;
return; return;
} }